diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
| commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
| tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/lossless-video.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
| download | ffmpeg-841a288cb32785400261cbab959fcfb982d3f699.tar.gz | |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/lossless-video.mak')
| -rw-r--r-- | tests/fate/lossless-video.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index b648b082d1..f918ac42d8 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,9 +1,9 @@ -FATE_CLLC += fate-cllc-rgb -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_CLLC += fate-cllc-rgb +fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi + FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CLLC) fate-cllc: $(FATE_CLLC) @@ -40,12 +40,12 @@ fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib -fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi - FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib +fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi + FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes) FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO) |