* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f': FATE: add tests for the shuffleplanes filter Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>