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/microsoft.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/microsoft.mak')
| -rw-r--r-- | tests/fate/microsoft.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index a2b3f1f228..10aeaf6681 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,12 +1,12 @@ FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an -FATE_MSVIDEO1 += fate-msvideo1-16bit -fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 - FATE_MSVIDEO1 += fate-msvideo1-8bit fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 +FATE_MSVIDEO1 += fate-msvideo1-16bit +fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 + FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1) fate-msvideo1: $(FATE_MSVIDEO1) @@ -33,12 +33,12 @@ fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091 fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1 -FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021 -fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 - FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143 fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021 +fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 + FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an |