mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +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>
45 lines
1.5 KiB
Makefile
45 lines
1.5 KiB
Makefile
FATE_BINKAUDIO += fate-binkaudio-dct
|
|
fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
|
|
fate-binkaudio-dct: CMP = oneoff
|
|
fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm
|
|
fate-binkaudio-dct: FUZZ = 2
|
|
|
|
FATE_BINKAUDIO += fate-binkaudio-rdft
|
|
fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik
|
|
fate-binkaudio-rdft: CMP = oneoff
|
|
fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
|
|
fate-binkaudio-rdft: FUZZ = 2
|
|
|
|
FATE_AUDIO += $(FATE_BINKAUDIO)
|
|
fate-binkaudio: $(FATE_BINKAUDIO)
|
|
|
|
FATE_AUDIO += fate-dts
|
|
fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
|
|
fate-dts: CMP = oneoff
|
|
fate-dts: REF = $(SAMPLES)/dts/dts.pcm
|
|
|
|
FATE_AUDIO += fate-imc
|
|
fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
|
|
fate-imc: CMP = oneoff
|
|
fate-imc: REF = $(SAMPLES)/imc/imc.pcm
|
|
|
|
FATE_AUDIO += fate-nellymoser
|
|
fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv
|
|
fate-nellymoser: CMP = oneoff
|
|
fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
|
|
|
|
FATE_AUDIO += fate-nellymoser-aref-encode
|
|
fate-nellymoser-aref-encode: $(AREF)
|
|
fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
|
|
fate-nellymoser-aref-encode: CMP = stddev
|
|
fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav
|
|
fate-nellymoser-aref-encode: CMP_SHIFT = -1172
|
|
fate-nellymoser-aref-encode: CMP_TARGET = 9617
|
|
fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
|
|
|
|
FATE_AUDIO += fate-ws_snd
|
|
fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
|
|
|
|
FATE_FFMPEG += $(FATE_AUDIO)
|
|
fate-audio: $(FATE_AUDIO)
|