ffmpeg/libavfilter
Michael Niedermayer fae714a9fb Merge remote-tracking branch 'qatar/master'
* 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>
2011-10-18 01:54:40 +02:00
..
libmpcodecs
x86
Makefile lavfi: port libmpcodecs delogo filter 2011-10-17 18:05:41 +02:00
af_aconvert.c
af_aconvert_rematrix.c
af_aformat.c
af_anull.c
af_aresample.c af_aresample: fix properties setting in the output buffer 2011-10-16 00:52:23 +02:00
af_ashowinfo.c af_ashowinfo: fix plane size computation for planar layout formats 2011-10-16 01:58:31 +02:00
all_channel_layouts.h
allfilters.c lavfi: port libmpcodecs delogo filter 2011-10-17 18:05:41 +02:00
asink_anullsink.c
asrc_abuffer.c
asrc_abuffer.h
asrc_anullsrc.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
avcodec.c
avcodec.h
avfilter.c lavfi: add debug trace when processing events 2011-09-25 22:47:51 +02:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
avfiltergraph.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
avfiltergraph.h Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
buffersink.h
defaults.c
drawutils.c
drawutils.h
formats.c lavfi: add LUT (LookUp Table) generic filters 2011-10-17 18:05:38 +02:00
gradfun.h
graphparser.c lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 2011-09-28 08:02:53 +02:00
internal.h lavfi: add LUT (LookUp Table) generic filters 2011-10-17 18:05:38 +02:00
libavfilter.v
sink_buffer.c sink_buffer: fix typo 2011-09-28 22:28:47 +02:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
transform.c doxygen: remove a few @file parameters. 2011-10-04 08:04:17 +02:00
transform.h doxygen: remove a few @file parameters. 2011-10-04 08:04:17 +02:00
vf_aspect.c
vf_blackframe.c
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_copy.c
vf_crop.c vf_crop: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
vf_cropdetect.c
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_deshake.c deshake: simplify filename check. 2011-10-04 21:36:54 +02:00
vf_drawbox.c
vf_drawtext.c vf_drawtext: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_fade.c
vf_fieldorder.c
vf_fifo.c
vf_format.c
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_libopencv.c
vf_lut.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
vf_mp.c
vf_null.c
vf_overlay.c vf_overlay: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_pad.c vf_pad: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_pixdesctest.c
vf_scale.c vf_scale: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_select.c vf_select: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_setpts.c vf_setpts: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_settb.c vf_settb: remove mathematical constants now redundant. 2011-10-13 18:08:50 +02:00
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_transpose.c
vf_unsharp.c vf_unsharp: set default chroma size value to 5x5 2011-09-29 07:20:05 +02:00
vf_vflip.c
vf_yadif.c
vsink_nullsink.c
vsrc_buffer.c
vsrc_buffer.h
vsrc_color.c vsrc_color: use internal timebase 2011-09-28 08:03:11 +02:00
vsrc_mptestsrc.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
vsrc_nullsrc.c vsrc_nullsrc: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
vsrc_testsrc.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
yadif.h