• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · fae714a9
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    fae714a9
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avconv.texi Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...