[FFmpeg-cvslog] Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 21:54:41 2015 +0100| [9ba0719244bf626e817e56c9aad0272ca55b0484] | committer: Michael Niedermayer

Merge commit 'f661006f235fa58bc756610cdc76c662ac0fab5f' into release/0.10

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

Conflicts:
	doc/avconv.texi

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

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