diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 17:20:48 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 17:20:53 +0300 |
| commit | 884dd175f061c03d7ba4896685e81bf8adc3ea94 (patch) | |
| tree | 77916c5f05f9c676cfc11d5dfee5feaf5f9649d9 /tests | |
| parent | 622f18a2bf467623e6f68c4f8276c2efefda206f (diff) | |
| parent | 11843ededacd0157aea642771837557549b5b417 (diff) | |
Merge commit '11843ededacd0157aea642771837557549b5b417'
* commit '11843ededacd0157aea642771837557549b5b417':
fate: Add separate target for all indeo3 tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/indeo.mak | 11 | ||||
| -rw-r--r-- | tests/ref/fate/indeo3-1 (renamed from tests/ref/fate/indeo3) | 0 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak index 6beb1f00d1..bb3c154bb8 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 index 0f5564928f..0f5564928f 100644 --- a/tests/ref/fate/indeo3 +++ b/tests/ref/fate/indeo3-1 |