mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-03 05:22:10 +00:00
1cbf7fb434
* qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
57 lines
1.9 KiB
Makefile
57 lines
1.9 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-bmv-audio
|
|
fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn
|
|
|
|
FATE_AUDIO += fate-delphine-cin-audio
|
|
fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
|
|
|
|
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-sierra-vmd-audio
|
|
fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn
|
|
|
|
FATE_AUDIO += fate-smacker-audio
|
|
fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn
|
|
|
|
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)
|