[FFmpeg-cvslog] Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 21 04:04:48 2014 +0100| [2b8effcda3f98e3df48bed305ee416bbe06c7230] | committer: Michael Niedermayer

Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1

* commit '9920a8a83f578821e00212da6b79c8997a725fa8':
  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=2b8effcda3f98e3df48bed305ee416bbe06c7230
---