mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02: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>
81 lines
3.0 KiB
Makefile
81 lines
3.0 KiB
Makefile
FATE_DEMUX += fate-avio-direct
|
|
fate-avio-direct: CMD = framecrc -avioflags direct -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct
|
|
|
|
FATE_DEMUX += fate-adts-demux
|
|
fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
|
|
|
|
FATE_DEMUX += fate-aea-demux
|
|
fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
|
|
|
|
FATE_DEMUX += fate-bink-demux
|
|
fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
|
|
|
|
FATE_DEMUX += fate-caf
|
|
fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy
|
|
|
|
FATE_DEMUX += fate-cdxl-demux
|
|
fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy
|
|
|
|
FATE_DEMUX += fate-d-cinema-demux
|
|
fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
|
|
|
|
FATE_DEMUX += fate-iv8-demux
|
|
fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy
|
|
|
|
FATE_DEMUX += fate-lmlm4-demux
|
|
fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
|
|
|
|
FATE_DEMUX += fate-maxis-xa
|
|
fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
|
|
|
|
FATE_DEMUX += fate-mtv
|
|
fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
|
|
|
|
FATE_DEMUX += fate-mxf-demux
|
|
fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
|
|
|
|
FATE_DEMUX += fate-nc-demux
|
|
fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
|
|
|
|
FATE_DEMUX += fate-nsv-demux
|
|
fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
|
|
|
|
FATE_DEMUX += fate-oma-demux
|
|
fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
|
|
|
|
FATE_DEMUX += fate-psx-str
|
|
fate-psx-str: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str
|
|
|
|
FATE_DEMUX += fate-psx-str-v3-mdec
|
|
fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an
|
|
|
|
FATE_DEMUX += fate-pva-demux
|
|
fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy
|
|
|
|
FATE_DEMUX += fate-qcp-demux
|
|
fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
|
|
|
|
FATE_DEMUX += fate-redcode-demux
|
|
fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
|
|
|
|
FATE_DEMUX += fate-siff
|
|
fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
|
|
|
|
FATE_DEMUX += fate-smjpeg-demux
|
|
fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy
|
|
|
|
FATE_DEMUX += fate-westwood-aud
|
|
fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy
|
|
|
|
FATE_DEMUX += fate-wtv-demux
|
|
fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
|
|
|
|
FATE_DEMUX += fate-xmv-demux
|
|
fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
|
|
|
|
FATE_DEMUX += fate-xwma-demux
|
|
fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy
|
|
|
|
FATE_FFMPEG += $(FATE_DEMUX)
|
|
fate-demux: $(FATE_DEMUX)
|