mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-17 21:00:51 +00:00
dd3ca3ea15
* qatar/master: fate: Add tests for more AAC features. aacps: Add missing newline in error message. fate: Add tests for vc1/wmapro in ism. aacdec: Add a fate test for 5.1 channel SBR. aacdec: Turn off PS for multichannel files that use PCE based configs. cabac: remove put_cabac_u/ueg from cabac-test. swscale: RGB4444 and BGR444 input FATE: add test for xWMA demuxer. FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder. mpegaudiodec: optimized iMDCT transform mpegaudiodec: change imdct window arrangment for better pointer alignment mpegaudiodec: move imdct and windowing function to mpegaudiodsp mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm. FATE: test to exercise WTV demuxer. mjpegdec: K&R formatting cosmetics swscale: K&R formatting cosmetics for code examples swscale: K&R reformatting cosmetics for header files FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised. Conflicts: libavcodec/cabac.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec.c libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h libavcodec/mpegaudiodsp_template.c libavcodec/x86/Makefile libavcodec/x86/imdct36_sse.asm libavcodec/x86/mpegaudiodec_mmx.c libswscale/swscale-test.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/video.mak tests/fate/wma.mak tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
37 lines
1.5 KiB
Makefile
37 lines
1.5 KiB
Makefile
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-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
|
|
|
|
FATE_MICROSOFT += fate-msvideo1-8bit
|
|
fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
|
|
|
|
FATE_MICROSOFT += 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-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-vc1_sa00050
|
|
fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
|
|
|
|
FATE_MICROSOFT += fate-vc1_sa10091
|
|
fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
|
|
|
|
FATE_MICROSOFT += fate-vc1_sa20021
|
|
fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
|
|
|
|
FATE_MICROSOFT += fate-vc1-ism
|
|
fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an
|
|
|
|
FATE_TESTS += $(FATE_MICROSOFT)
|
|
fate-microsoft: $(FATE_MICROSOFT)
|