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/lossless-video.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/lossless-video.mak')
| -rw-r--r-- | tests/fate/lossless-video.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index cbf7f5292a..b648b082d1 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -4,7 +4,7 @@ fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi FATE_CLLC += fate-cllc-argb fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi -FATE_LOSSLESS_VIDEO += $(FATE_CLLC) +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CLLC) fate-cllc: $(FATE_CLLC) FATE_LAGARITH += fate-lagarith-rgb24 @@ -19,7 +19,7 @@ fate-lagarith-yuy2: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yuy2.avi FATE_LAGARITH += fate-lagarith-yv12 fate-lagarith-yv12: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yv12.avi -FATE_SAMPLES_AVCONV += $(FATE_LAGARITH) +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH) fate-lagarith: $(FATE_LAGARITH) FATE_LOCO += fate-loco-rgb @@ -28,22 +28,22 @@ fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi FATE_LOCO += fate-loco-yuy2 fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi -FATE_LOSSLESS_VIDEO += $(FATE_LOCO) +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO) fate-loco: $(FATE_LOCO) -FATE_LOSSLESS_VIDEO += fate-msrle-8bit +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 -FATE_LOSSLESS_VIDEO += fate-mszh +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi -FATE_LOSSLESS_VIDEO += fate-vble +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi -FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zlib +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi -FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zerocodec +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes) |