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@gmx.at>

diff --cc tests/fate/filter.mak
index c0cb26998f8ff500760a2c574da88a138780ce50,1d7d06d22dfc5b336cdf4e22c0a86cb76fe657dd..96d84cacac95f0e5e5d468c4990379f291e9cc65
--- 1/tests/fate/filter.mak
--- 2/tests/fate/filter.mak
+++ b/tests/fate/filter.mak
@@@ -39,9 -33,23 +39,23 @@@ fate-filter-aresample: REF = $(SAMPLES)
  FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur
  fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1
  
 -fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685
+ FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap
+ fate-filter-channelmap: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.wav
+ fate-filter-channelmap: tests/data/asynth-44100-6.wav
+ fate-filter-channelmap: CMD = md5 -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/channelmap -f wav -flags +bitexact
+ fate-filter-channelmap: CMP = oneline
 -fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an
++fate-filter-channelmap: REF = 06168d06085e2c0603e4e118ba4cade2
+ 
+ FATE_FILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit
+ fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+ fate-filter-channelsplit: tests/data/asynth-44100-2.wav
+ fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s16le
+ fate-filter-channelsplit: CMP = oneline
+ fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597
+ 
 +fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an
  
 -FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo
 +FATE_FILTER-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo
  
  FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
  fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5

diff --cc tests/ref/fate/filter-overlay
index 0000000000000000000000000000000000000000,d988a2e4e108c0bf64d576a58c0b434e8f95d227..5e2805509e0fefc6eb9168b01ee8a184f888fc5d
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/filter-overlay
+++ b/tests/ref/fate/filter-overlay
@@@ -1,0 -1,51 +1,51 @@@
 -0,          0,          0,        1,   152064, 0xf6f773b6
 -0,          1,          1,        1,   152064, 0x8e67618e
 -0,          2,          2,        1,   152064, 0xc8eff2ef
 -0,          3,          3,        1,   152064, 0xcf39936c
 -0,          4,          4,        1,   152064, 0xaf18c4d1
 -0,          5,          5,        1,   152064, 0x7e69911e
 -0,          6,          6,        1,   152064, 0x1b70214f
 -0,          7,          7,        1,   152064, 0xc8032176
 -0,          8,          8,        1,   152064, 0xefb42ecc
 -0,          9,          9,        1,   152064, 0xfb210e4b
 -0,         10,         10,        1,   152064, 0x2ee24b11
 -0,         11,         11,        1,   152064, 0x0dac02a5
 -0,         12,         12,        1,   152064, 0x9a5ce483
 -0,         13,         13,        1,   152064, 0x6bb7c758
 -0,         14,         14,        1,   152064, 0xcbb545e5
 -0,         15,         15,        1,   152064, 0x81c1b339
 -0,         16,         16,        1,   152064, 0xfa38d624
 -0,         17,         17,        1,   152064, 0x56c5e63e
 -0,         18,         18,        1,   152064, 0x419d194d
 -0,         19,         19,        1,   152064, 0xed1a92b8
 -0,         20,         20,        1,   152064, 0xd2c0aa39
 -0,         21,         21,        1,   152064, 0x6214ddd5
 -0,         22,         22,        1,   152064, 0xa978e19f
 -0,         23,         23,        1,   152064, 0x676422a2
 -0,         24,         24,        1,   152064, 0x5213dd62
 -0,         25,         25,        1,   152064, 0x13c1a404
 -0,         26,         26,        1,   152064, 0xa543a1a2
 -0,         27,         27,        1,   152064, 0x8d0d0bed
 -0,         28,         28,        1,   152064, 0x000304cf
 -0,         29,         29,        1,   152064, 0x7f75b0ab
 -0,         30,         30,        1,   152064, 0x68d07ce6
 -0,         31,         31,        1,   152064, 0xb88c9852
 -0,         32,         32,        1,   152064, 0x4be5ae13
 -0,         33,         33,        1,   152064, 0x85b3f7b1
 -0,         34,         34,        1,   152064, 0x9facb7d5
 -0,         35,         35,        1,   152064, 0x9f11617e
 -0,         36,         36,        1,   152064, 0x43393f46
 -0,         37,         37,        1,   152064, 0xd45c3b92
 -0,         38,         38,        1,   152064, 0x53de7e1b
 -0,         39,         39,        1,   152064, 0xd1c685a7
 -0,         40,         40,        1,   152064, 0x21e1778f
 -0,         41,         41,        1,   152064, 0xe2b1abe1
 -0,         42,         42,        1,   152064, 0x8623b5aa
 -0,         43,         43,        1,   152064, 0xfc700aa3
 -0,         44,         44,        1,   152064, 0x30a2d120
 -0,         45,         45,        1,   152064, 0xa35e4d15
 -0,         46,         46,        1,   152064, 0xa3fb11c5
 -0,         47,         47,        1,   152064, 0x034f8fb7
 -0,         48,         48,        1,   152064, 0x921c7d85
 -0,         49,         49,        1,   152064, 0x7a94b9bf
+ #tb 0: 1/25
++0,          0,          0,        1,   152064, 0xffb77a34
++0,          1,          1,        1,   152064, 0x866267f2
++0,          2,          2,        1,   152064, 0x1033f97f
++0,          3,          3,        1,   152064, 0x266699ea
++0,          4,          4,        1,   152064, 0x3d50cb34
++0,          5,          5,        1,   152064, 0x04559792
++0,          6,          6,        1,   152064, 0x70432827
++0,          7,          7,        1,   152064, 0x3fd8282c
++0,          8,          8,        1,   152064, 0x512c353b
++0,          9,          9,        1,   152064, 0x3d6114eb
++0,         10,         10,        1,   152064, 0xf87751aa
++0,         11,         11,        1,   152064, 0x76cb091f
++0,         12,         12,        1,   152064, 0xbe63eb36
++0,         13,         13,        1,   152064, 0xc19bcdd5
++0,         14,         14,        1,   152064, 0xe21c4c5d
++0,         15,         15,        1,   152064, 0x671ab9b5
++0,         16,         16,        1,   152064, 0x4ffcdcd3
++0,         17,         17,        1,   152064, 0x6cc7ed10
++0,         18,         18,        1,   152064, 0x19612034
++0,         19,         19,        1,   152064, 0x31c0999a
++0,         20,         20,        1,   152064, 0xd14eb105
++0,         21,         21,        1,   152064, 0x4976e4b4
++0,         22,         22,        1,   152064, 0x7bc8e85d
++0,         23,         23,        1,   152064, 0xaf522965
++0,         24,         24,        1,   152064, 0x0b01e419
++0,         25,         25,        1,   152064, 0x1c07aacb
++0,         26,         26,        1,   152064, 0x2813a828
++0,         27,         27,        1,   152064, 0x956412a4
++0,         28,         28,        1,   152064, 0xb9f10b96
++0,         29,         29,        1,   152064, 0x756bb78c
++0,         30,         30,        1,   152064, 0x758f8389
++0,         31,         31,        1,   152064, 0xa8a19f1b
++0,         32,         32,        1,   152064, 0x5846b4ae
++0,         33,         33,        1,   152064, 0xb9a9fe23
++0,         34,         34,        1,   152064, 0xefd6be7d
++0,         35,         35,        1,   152064, 0xffde6849
++0,         36,         36,        1,   152064, 0xd8284623
++0,         37,         37,        1,   152064, 0xa1754236
++0,         38,         38,        1,   152064, 0x00c384cd
++0,         39,         39,        1,   152064, 0xa3538c53
++0,         40,         40,        1,   152064, 0x039c7df0
++0,         41,         41,        1,   152064, 0x89abb26f
++0,         42,         42,        1,   152064, 0xd84cbc79
++0,         43,         43,        1,   152064, 0xd87111a0
++0,         44,         44,        1,   152064, 0x6dcbd7cc
++0,         45,         45,        1,   152064, 0x2a7b53d5
++0,         46,         46,        1,   152064, 0xbb70187c
++0,         47,         47,        1,   152064, 0xfc809695
++0,         48,         48,        1,   152064, 0x5b608465
++0,         49,         49,        1,   152064, 0x6169c077