mirror of https://git.ffmpeg.org/ffmpeg.git
* 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> |
||
---|---|---|
.. | ||
arm | ||
avr32 | ||
bfin | ||
mips | ||
ppc | ||
sh4 | ||
tomi | ||
x86 | ||
Makefile | ||
adler32.c | ||
adler32.h | ||
aes.c | ||
aes.h | ||
attributes.h | ||
audio_fifo.c | ||
audio_fifo.h | ||
audioconvert.c | ||
audioconvert.h | ||
avassert.h | ||
avstring.c | ||
avstring.h | ||
avutil.h | ||
base64.c | ||
base64.h | ||
bprint.c | ||
bprint.h | ||
bswap.h | ||
colorspace.h | ||
common.h | ||
cpu.c | ||
cpu.h | ||
crc.c | ||
crc.h | ||
crc_data.h | ||
des.c | ||
des.h | ||
dict.c | ||
dict.h | ||
error.c | ||
error.h | ||
eval.c | ||
eval.h | ||
fifo.c | ||
fifo.h | ||
file.c | ||
file.h | ||
imgutils.c | ||
imgutils.h | ||
integer.c | ||
integer.h | ||
internal.h | ||
intfloat.h | ||
intfloat_readwrite.c | ||
intfloat_readwrite.h | ||
intmath.h | ||
intreadwrite.h | ||
inverse.c | ||
lfg.c | ||
lfg.h | ||
libavutil.v | ||
libm.h | ||
lls.c | ||
lls.h | ||
log.c | ||
log.h | ||
lzo.c | ||
lzo.h | ||
mathematics.c | ||
mathematics.h | ||
md5.c | ||
md5.h | ||
mem.c | ||
mem.h | ||
opt.c | ||
opt.h | ||
parseutils.c | ||
parseutils.h | ||
pca.c | ||
pca.h | ||
pixdesc.c | ||
pixdesc.h | ||
pixfmt.h | ||
random_seed.c | ||
random_seed.h | ||
rational.c | ||
rational.h | ||
rc4.c | ||
rc4.h | ||
samplefmt.c | ||
samplefmt.h | ||
sha.c | ||
sha.h | ||
softfloat.c | ||
softfloat.h | ||
timecode.c | ||
timecode.h | ||
timer.h | ||
timestamp.h | ||
tree.c | ||
tree.h | ||
utils.c | ||
x86_cpu.h |