[FFmpeg-cvslog] Merge commit '11843ededacd0157aea642771837557549b5b417'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 15:20:48 2016 +0100| [884dd175f061c03d7ba4896685e81bf8adc3ea94] | committer: Derek Buitenhuis

Merge commit '11843ededacd0157aea642771837557549b5b417'

* commit '11843ededacd0157aea642771837557549b5b417':
  fate: Add separate target for all indeo3 tests

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=884dd175f061c03d7ba4896685e81bf8adc3ea94
---

 tests/fate/indeo.mak                |   11 +++++++----
 tests/ref/fate/{indeo3 => indeo3-1} |    0
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak
index 6beb1f0..bb3c154 100644
--- a/tests/fate/indeo.mak
+++ b/tests/fate/indeo.mak
@@ -7,12 +7,15 @@ fate-indeo2-intra: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, INDEO2) += $(FATE_INDEO2)
 fate-indeo2: $(FATE_INDEO2)
 
-FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3
-fate-indeo3: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov
+FATE_INDEO3-$(CONFIG_MOV_DEMUXER) += fate-indeo3-1
+fate-indeo3-1: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov
 
-FATE_INDEO-$(call DEMDEC, AVI, INDEO3) += fate-indeo3-2
+FATE_INDEO3-$(CONFIG_AVI_DEMUXER) += fate-indeo3-2
 fate-indeo3-2: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/OPENINGH.avi
 
+FATE_SAMPLES_AVCONV-$(CONFIG_INDEO3_DECODER) += $(FATE_INDEO3-yes)
+fate-indeo3: $(FATE_INDEO3-yes)
+
 FATE_INDEO-$(call DEMDEC, AVI, INDEO4) += fate-indeo4
 fate-indeo4: CMD = framecrc -i $(TARGET_SAMPLES)/iv41/indeo41-partial.avi -an
 
@@ -20,4 +23,4 @@ FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5
 fate-indeo5: CMD = framecrc -i $(TARGET_SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
 
 FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes)
-fate-indeo: $(FATE_INDEO2) $(FATE_INDEO-yes)
+fate-indeo: $(FATE_INDEO2) $(FATE_INDEO3-yes) $(FATE_INDEO-yes)
diff --git a/tests/ref/fate/indeo3 b/tests/ref/fate/indeo3-1
similarity index 100%
rename from tests/ref/fate/indeo3
rename to tests/ref/fate/indeo3-1


======================================================================