• 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
qcp.c 6.03 KB