diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
| commit | 48706f41e1a17e04b0aa09852eff021833708233 (patch) | |
| tree | d33af96fedd771264c6717eacd2d54800bc05aff /tests/fate/microsoft.mak | |
| parent | 9d35fa43eea1c0646a5f3e4ba537d58f574b9ca7 (diff) | |
| parent | a85ce653fb14ae968419453fabf1ffe10d1f15df (diff) | |
| download | ffmpeg-48706f41e1a17e04b0aa09852eff021833708233.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12: check for available bits to avoid an infinite loop
fate: add some shorthands to run groups of tests
fate: Give some tests more sensible names.
cosmetics: Rename ffsink to avsink.
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/dpcm.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/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/wma.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/microsoft.mak')
| -rw-r--r-- | tests/fate/microsoft.mak | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index d8993f9319..16ba798e1d 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,36 +1,45 @@ FATE_MICROSOFT += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an -FATE_MICROSOFT += fate-msvideo1-16bit +FATE_MSVIDEO1 += fate-msvideo1-16bit fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 -FATE_MICROSOFT += fate-msvideo1-8bit +FATE_MSVIDEO1 += fate-msvideo1-8bit fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -FATE_MICROSOFT += fate-wmv8-drm +FATE_MICROSOFT += $(FATE_MSVIDEO1) +fate-msvideo1: $(FATE_MSVIDEO1) + +FATE_WMV8_DRM += fate-wmv8-drm # discard last packet to avoid fails due to overread of VC-1 decoder fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162 -FATE_MICROSOFT += fate-wmv8-drm-nodec +FATE_WMV8_DRM += fate-wmv8-drm-nodec fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy #FATE_MICROSOFT += fate-wmv8-x8intra #fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(SAMPLES)/wmv8/wmv8_x8intra.wmv -an -FATE_MICROSOFT += fate-vc1 -fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1 +FATE_MICROSOFT += $(FATE_WMV8_DRM) +fate-wmv8_drm: $(FATE_WMV8_DRM) + +FATE_VC1 += fate-vc1_sa00040 +fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1 -FATE_MICROSOFT += fate-vc1_sa00050 +FATE_VC1 += fate-vc1_sa00050 fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1 -FATE_MICROSOFT += fate-vc1_sa10091 +FATE_VC1 += fate-vc1_sa10091 fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1 -FATE_MICROSOFT += fate-vc1_sa20021 +FATE_VC1 += fate-vc1_sa20021 fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 -FATE_MICROSOFT += fate-vc1-ism +FATE_VC1 += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an +FATE_MICROSOFT += $(FATE_VC1) +fate-vc1: $(FATE_VC1) + FATE_TESTS += $(FATE_MICROSOFT) fate-microsoft: $(FATE_MICROSOFT) |