[FFmpeg-cvslog] Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 12:11:10 2015 +0200| [8d4460f1bbe94e02382594cee8dbb3e8ad2f9f32] | committer: Michael Niedermayer

Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'

* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949':
  doc: Use the succinct syntax for the channelmap example

Conflicts:
	doc/filters.texi

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

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