[FFmpeg-cvslog] Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 11 01:26:31 2014 +0200| [5e3da256184e13502b3428f94e180888436d157b] | committer: Michael Niedermayer

Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e3da256184e13502b3428f94e180888436d157b
---