mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
61930bd0d7
* qatar/master: (27 commits) libxvid: Give more suitable names to libxvid-related files. libxvid: Separate libxvid encoder from libxvid rate control code. jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse(). fate: cosmetics: lowercase some comments fate: Give more consistent names to some RealVideo/RealAudio tests. lavfi: add avfilter_get_audio_buffer_ref_from_arrays(). lavfi: add extended_data to AVFilterBuffer. lavc: check that extended_data is properly set in avcodec_encode_audio2(). lavc: pad last audio frame with silence when needed. samplefmt: add a function for filling a buffer with silence. samplefmt: add a function for copying audio samples. lavr: do not try to copy to uninitialized output audio data. lavr: make avresample_read() with NULL output discard samples. fate: split idroq audio and video into separate tests fate: improve dependencies fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests fate: split some combined tests into separate audio and video tests fate: fix dependencies for probe tests mips: intreadwrite: fix inline asm for gcc 4.8 mips: intreadwrite: remove unnecessary inline asm ... Conflicts: cmdutils.h configure doc/APIchanges doc/filters.texi ffmpeg.c ffplay.c libavcodec/internal.h libavcodec/jpeglsdec.c libavcodec/libschroedingerdec.c libavcodec/libxvid.c libavcodec/libxvid_rc.c libavcodec/utils.c libavcodec/version.h libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.h tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/libavutil.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/ea-mad tests/ref/fate/ea-tqi Merged-by: Michael Niedermayer <michaelni@gmx.at>
47 lines
1.7 KiB
Makefile
47 lines
1.7 KiB
Makefile
FATE_MICROSOFT += 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_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_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_TESTS-no += fate-wmv8-x8intra
|
|
fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(SAMPLES)/wmv8/wmv8_x8intra.wmv -an
|
|
|
|
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_VC1 += fate-vc1_sa00050
|
|
fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
|
|
|
|
FATE_VC1 += fate-vc1_sa10091
|
|
fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
|
|
|
|
FATE_VC1 += fate-vc1_sa20021
|
|
fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
|
|
|
|
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_FFMPEG += $(FATE_MICROSOFT)
|
|
fate-microsoft: $(FATE_MICROSOFT)
|