diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 14:15:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 14:15:47 +0200 |
| commit | c5fd9d3c35cb743226770e1077e6b082f44bd889 (patch) | |
| tree | e27eecd0a854a9e8a2374410b343f756835a468e /tests/fate/qt.mak | |
| parent | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (diff) | |
| parent | 61cc99748c1107a2f07491ce768156cc74b95e29 (diff) | |
| download | ffmpeg-c5fd9d3c35cb743226770e1077e6b082f44bd889.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add proper dependencies in qt.mak
fate: Add proper dependencies in lossless-video.mak
indeo3: do not try to output more lines than we can fit
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.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 3068ac63ec..03b2fcec71 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -1,52 +1,52 @@ -FATE_QT += fate-8bps +FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 -FATE_QT += fate-qdm2 +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: CMP = oneoff fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm fate-qdm2: FUZZ = 2 -FATE_QT += fate-qt-alaw-mono +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 += fate-qt-alaw-stereo +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 += fate-qt-ima4-mono +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 += fate-qt-ima4-stereo +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 += fate-qt-mac3-mono +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 += fate-qt-mac3-stereo +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 += fate-qt-mac6-mono +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 += fate-qt-mac6-stereo +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 += fate-qt-ulaw-mono +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 += fate-qt-ulaw-stereo +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 += fate-quickdraw +FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 -FATE_QT += fate-rpza +FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 -FATE_QT += fate-svq1 +FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 -FATE_QT-$(CONFIG_ZLIB) += fate-svq3 +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_QT += $(FATE_QT-yes) |