[FFmpeg-cvslog] Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 20 14:48:28 2014 +0200| [3bc5aa65bbcf79e869461a557bea356a66e0e77e] | committer: Michael Niedermayer

Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2

* commit '40c7613ecf2f3f7565309f9780183228605c3684':
  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=3bc5aa65bbcf79e869461a557bea356a66e0e77e
---