diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:25:37 +0200 |
| commit | 1f5e5d2205df568f86371660b0991ec7087e94e6 (patch) | |
| tree | de4e14688195143baab7988797d3329904a92ee4 /tests/fate/indeo.mak | |
| parent | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (diff) | |
| parent | ba13606ca6adbc74b4db4a72b0769397d6408791 (diff) | |
| download | ffmpeg-1f5e5d2205df568f86371660b0991ec7087e94e6.tar.gz | |
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
fate: Add a --target-samples path parameter
Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/indeo.mak')
| -rw-r--r-- | tests/fate/indeo.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak index c19d282efd..e725a6bda2 100644 --- a/tests/fate/indeo.mak +++ b/tests/fate/indeo.mak @@ -1,17 +1,17 @@ FATE_INDEO-$(call DEMDEC, AVI, INDEO2) += fate-indeo2 -fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI +fate-indeo2: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3 -fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov +fate-indeo3: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov FATE_INDEO-$(call DEMDEC, AVI, INDEO3) += fate-indeo3-2 -fate-indeo3-2: CMD = framecrc -i $(SAMPLES)/iv32/OPENINGH.avi +fate-indeo3-2: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/OPENINGH.avi FATE_INDEO-$(call DEMDEC, AVI, INDEO4) += fate-indeo4 -fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an +fate-indeo4: CMD = framecrc -i $(TARGET_SAMPLES)/iv41/indeo41-partial.avi -an FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5 -fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an +fate-indeo5: CMD = framecrc -i $(TARGET_SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes) fate-indeo: $(FATE_INDEO-yes) |