[FFmpeg-cvslog] Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 22:13:46 2014 +0200| [a1c4635558cbb0a311022a0c74258118d09d260e] | committer: Michael Niedermayer

Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
	doc/examples/muxing.c

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

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