[FFmpeg-cvslog] Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 13:09:06 2014 +0100| [7011aab5018a71d84ff00b375b94a5bb71b44937] | committer: Michael Niedermayer

Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f':
  FATE: add tests for the shuffleplanes filter

Conflicts:
	tests/fate/filter-video.mak

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

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