Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'

* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
  fate: Don't use files from SRC_PATH in the actual tests
  indeo4: reuse context block VLC for band instead of defaulting

Conflicts:
	tests/Makefile

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

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc tests/Makefile
index cd8c1e2821b6652ad21d668d768a9cf7a9f60c83,0951bdec3eb51bd0f7c08543125aa80c9ab054b9..09a5e055ac0db5864bc1ad778aa20226b11572dc
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -3,17 -1,7 +3,17 @@@ FFSERVER_REFFILE = $(SRC_PATH)/tests/ff
  VREF = tests/vsynth1/00.pgm
  AREF = tests/data/asynth1.sw
  
- OBJDIRS += tests/data tests/vsynth1
 +
 +$(AREF): CMP=
 +
 +ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
 +      @echo
 +      @echo "Unfortunately ffserver is broken and therefore its regression"
 +      @echo "test fails randomly. Treat the results accordingly."
 +      @echo
 +      $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
 +
+ OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
  
  $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
        $(M)./$< 'tests/vsynth1/'
@@@ -30,17 -18,12 +30,21 @@@ tests/data/vsynth1.yuv: tests/videogen$
  tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
        $(M)$< $(SRC_PATH)/tests/lena.pnm $@
  
 -tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
 +tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data
 +      $(M)$(TARGET_EXEC) ./$< \
 +        -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \
 +        -f ffmetadata -i $(SRC_PATH)/tests/test.ffmeta \
 +        -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
 +        -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
 +        -vcodec rawvideo -acodec pcm_s16le \
 +        -y $@ 2>/dev/null
 +
 +tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN
  
+ tests/data/filtergraphs/%: TAG = COPY
+ tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs
+       $(M)cp $< $@
+ 
  CHKCFG  = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1)))
  
  ALLYES  = $(strip $(call XYES, $(1)))

diff --cc tests/fate/filter-audio.mak
index a4168ee95eea007b5e3149412fe4ee836ffbbc80,bab1685f79bc5a2c1b36490a647561f9a2a56b90..91fa23fa31a867de79a49939413f3a8e32709c66
--- 1/tests/fate/filter-audio.mak
--- 2/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@@ -48,11 -42,12 +48,12 @@@ $(FATE_ATRIM): SRC = $(TARGET_PATH)/tes
  FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM)
  
  FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-channelmap
+ fate-filter-channelmap: tests/data/filtergraphs/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: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap -f wav -flags +bitexact
  fate-filter-channelmap: CMP = oneline
 -fate-filter-channelmap: REF = 21f1977c4f9705e2057083f84764e685
 +fate-filter-channelmap: REF = 06168d06085e2c0603e4e118ba4cade2
  
  FATE_AFILTER-$(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

diff --cc tests/fate/filter-video.mak
index 2df9cc87944c93740f37b34944b1483d0bedf074,c911d0d2520a8279949a84ae307154fe369d66a6..04c089f80792fed85f455d69efe0d116865a828d
--- 1/tests/fate/filter-video.mak
--- 2/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@@ -43,36 -30,17 +43,38 @@@ fate-filter-hqdn3d: CMD = framecrc -c:
  FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace
  fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace
  
 -FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate
 -fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate
 +FATE_FILTER_VSYNTH-$(call ALLYES, NEGATE_FILTER PERMS_FILTER) += fate-filter-negate
 +fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf perms=random,negate
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels
 +fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-waveform
 +fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact
  
  FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
- fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay
+ fate-filter-overlay: tests/data/filtergraphs/overlay
+ fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay
  
 +FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_rgb
 +fate-filter-overlay_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_rgb
 +
 +FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420
 +fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv420
 +
 +FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444
 +fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(SRC_PATH)/tests/filtergraphs/overlay_yuv444
 +
 +FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields
 +fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields
 +
  FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER  SETTB_FILTER) += fate-filter-setpts
- fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(SRC_PATH)/tests/filtergraphs/setpts
+ 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_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