[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 14:32:47 2014 +0100| [267c5723e08e04346e447b1e58cf81c80b13f799] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a test for the ONE_STR mapping mode of the channelmap filter

Conflicts:
	tests/fate/filter-audio.mak

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

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