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

Conflicts:
	tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>