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/dpcm.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/dpcm.mak')
| -rw-r--r-- | tests/fate/dpcm.mak | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index abc25edc9b..dd27246324 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -1,14 +1,14 @@ FATE_DPCM-$(call DEMDEC, ROQ, ROQ_DPCM) += fate-dpcm-idroq -fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn +fate-dpcm-idroq: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -vn FATE_DPCM-$(call DEMDEC, IPMOVIE, INTERPLAY_DPCM) += fate-dpcm-interplay -fate-dpcm-interplay: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn +fate-dpcm-interplay: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn FATE_DPCM-$(call DEMDEC, SOL, SOL_DPCM) += fate-dpcm-sierra -fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le +fate-dpcm-sierra: CMD = md5 -i $(TARGET_SAMPLES)/sol/lsl7sample.sol -f s16le FATE_DPCM-$(call DEMDEC, AVI, XAN_DPCM) += fate-dpcm-xan -fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le +fate-dpcm-xan: CMD = md5 -i $(TARGET_SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le FATE_SAMPLES_AVCONV += $(FATE_DPCM-yes) fate-dpcm: $(FATE_DPCM-yes) |