Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

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

Conflicts:
	tests/fate/filter-video.mak

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

diff --cc tests/fate/filter-video.mak
index 68e9f87,2869932..2f3ed62
--- 1/tests/fate/filter-video.mak
--- 2/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@@ -100,9 -56,14 +100,17 @@@ FATE_FILTER_VSYNTH-$(call ALLYES, SETPT
  fate-filter-setpts: tests/data/filtergraphs/setpts
  fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts
  
+ FATE_SHUFFLEPLANES += fate-filter-shuffleplanes-dup-luma
+ fate-filter-shuffleplanes-dup-luma: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=yuva444p,shuffleplanes=0:0:0:0
+ 
+ FATE_SHUFFLEPLANES += fate-filter-shuffleplanes-swapuv
+ fate-filter-shuffleplanes-swapuv: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf shuffleplanes=0:2:1
+ 
+ FATE_FILTER_VSYNTH-$(CONFIG_SHUFFLEPLANES_FILTER) += $(FATE_SHUFFLEPLANES)
+ 
 +FATE_FILTER_VSYNTH-$(CONFIG_TELECINE_FILTER) += fate-filter-telecine
 +fate-filter-telecine: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine
 +
  FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose
  fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose