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/qt.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/qt.mak')
| -rw-r--r-- | tests/fate/qt.mak | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak index 03b2fcec71..6d78822fda 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -1,53 +1,53 @@ FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps -fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 +fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, QDM2) += fate-qdm2 -fate-qdm2: CMD = pcm -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov +fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov fate-qdm2: CMP = oneoff fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm fate-qdm2: FUZZ = 2 FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono -fate-qt-alaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le +fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo -fate-qt-alaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le +fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono -fate-qt-ima4-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le +fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo -fate-qt-ima4-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le +fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono -fate-qt-mac3-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le +fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo -fate-qt-mac3-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le +fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono -fate-qt-mac6-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le +fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo -fate-qt-mac6-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le +fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono -fate-qt-ulaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le +fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo -fate-qt-ulaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le +fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw -fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 +fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza -fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 +fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1 -fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 +fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10 FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3 -fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an +fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an FATE_QT += $(FATE_QT-yes) |