mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-11 01:00:46 +00:00
* qatar/master: avconv: add presets rtsp: Expose the flag options via private AVOptions for sdp and rtp, too rtsp: Make the rtsp flags avoptions set via a define rtpenc: Set a default video codec avoptions: Fix av_opt_flag_is_set rtp: Fix ff_rtp_get_payload_type doc: Update the documentation on setting options for RTSP rtsp: Remove the separate filter_source variable rtsp: Accept options via private avoptions instead of URL options rtsp: Simplify AVOption definitions rtsp: Merge the AVOption lists lavfi: port libmpcodecs delogo filter lavfi: port boxblur filter from libmpcodecs lavfi: add negate filter lavfi: add LUT (LookUp Table) generic filters AVOptions: don't segfault on NULL parameter in av_set_options_string() avio: Check for invalid buffer length. mpegenc/mpegtsenc: add muxrate private options. lavf: deprecate AVFormatContext.file_size mov: add support for TV metadata atoms tves, tvsn and stik Conflicts: Changelog doc/filters.texi doc/protocols.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/internal.h libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_lut.c libavformat/mpegtsenc.c libavformat/utils.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
arm | ||
avr32 | ||
bfin | ||
mips | ||
ppc | ||
sh4 | ||
tomi | ||
x86 | ||
adler32.c | ||
adler32.h | ||
aes.c | ||
aes.h | ||
attributes.h | ||
audioconvert.c | ||
audioconvert.h | ||
avassert.h | ||
avstring.c | ||
avstring.h | ||
avutil.h | ||
base64.c | ||
base64.h | ||
bswap.h | ||
colorspace.h | ||
common.h | ||
cpu.c | ||
cpu.h | ||
crc_data.h | ||
crc.c | ||
crc.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_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 | ||
Makefile | ||
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 | ||
timer.h | ||
tree.c | ||
tree.h | ||
utils.c | ||
x86_cpu.h |