[FFmpeg-cvslog] Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 02:03:31 2013 +0200| [d9d7c54960804262bff36939c8392087aa92a8d0] | committer: Michael Niedermayer

Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
  af_channelmap: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/af_channelmap.c

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

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