[FFmpeg-cvslog] Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 14:10:20 2013 +0100| [7a14564b2d4d95edc74fcbeae8e49664ad2a5d99] | committer: Michael Niedermayer

Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'

* commit '43a8333a16c796b3d855fb3aaa742103cb62731f':
  FATE: add a test for the channelsplit filter
  FATE: add a test for the channelmap filter
  FATE: add a test for the negate filter
  FATE: add a test for the overlay filter

Conflicts:
	tests/fate/filter.mak

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

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