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
..
examples	examples/decoding_encoding.c: test mpeg1 and h264	2011-10-17 20:36:03 +02:00
APIchanges	Merge remote-tracking branch 'qatar/master'	2011-10-14 03:48:22 +02:00
avconv.texi	Merge remote-tracking branch 'qatar/master'	2011-10-18 01:54:40 +02:00
avtools-common-opts.texi	Merge remote-tracking branch 'qatar/master'	2011-10-10 03:50:58 +02:00
avutil.txt	Remove unused softfloat implementation.	2011-05-11 13:43:30 +02:00
bitstream_filters.texi
build_system.txt	Revert some silly renamings that leaked in from a pull.	2011-03-29 02:27:13 +02:00
decoders.texi	decoders.texi: fix typos in rawvideo section	2011-05-20 10:14:00 +02:00
demuxers.texi	Rename ffplay to avplay.	2011-08-09 19:56:21 +02:00
developer.texi	Merge remote-tracking branch 'qatar/master'	2011-09-21 21:25:43 +02:00
encoders.texi	Merge remote-tracking branch 'qatar/master'	2011-10-13 06:00:03 +02:00
eval.texi	eval: add mathematical constants (PI, E, PHI).	2011-10-13 16:50:20 +02:00
faq.texi	Merge remote-tracking branch 'qatar/master'	2011-09-12 00:32:54 +02:00
fate.txt	fate.txt: replace FATE rsync command with a make command	2011-05-27 10:41:46 +02:00
ffmpeg-mt-authorship.txt	Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.	2011-04-19 01:17:59 +02:00
ffmpeg.texi	Allow to overwrite input stream tags.	2011-10-16 19:05:11 +02:00
ffmpeg.txt	doc: small ascii diagram on I/O files and streams in ffmpeg.c	2011-10-12 15:43:52 +02:00
ffplay.texi	ffplay.texi: document -codec	2011-09-27 22:00:20 +02:00
ffprobe.texi	ffprobe: parse arguments for -print_format writer	2011-10-09 16:03:13 +02:00
ffserver.conf	Rename ffserver to avserver.	2011-08-09 19:56:25 +02:00
ffserver.texi	Merge remote-tracking branch 'qatar/master'	2011-09-12 00:32:54 +02:00
filters.texi	Merge remote-tracking branch 'qatar/master'	2011-10-18 01:54:40 +02:00
general.texi	Add G.723.1 to the documentation.	2011-10-10 10:49:16 +02:00
git-howto.txt	fix typo	2011-04-10 04:31:54 +02:00
indevs.texi	lavdev/lavfi: add audio support	2011-09-16 21:22:05 +02:00
issue_tracker.txt	doc: issue tracking: explain the term issue	2011-09-02 23:08:03 +02:00
libavfilter.texi	Remove reference to the libavfilter soc SVN repo, update libavfilter status description	2011-09-10 23:40:52 +02:00
Makefile	build: create output directories as needed	2011-06-29 09:14:56 +01:00
metadata.texi
multithreading.txt
muxers.texi	Merge remote-tracking branch 'qatar/master'	2011-07-10 04:28:50 +02:00
optimization.txt	fix another forgotten mplayerhq.hu link	2011-04-08 01:35:43 +02:00
outdevs.texi	sdl: use the filename for defining the window title, if not specified	2011-06-05 13:17:38 +02:00
protocols.texi	Merge remote-tracking branch 'qatar/master'	2011-10-18 01:54:40 +02:00
rate_distortion.txt
RELEASE_NOTES	release_notes: document not fully understood mingw-sdl issue	2011-06-21 20:58:39 +02:00
snow.txt
soc.txt
swresample.txt	swr-docs: update due to last change to swresample	2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl	doc: replace @pxref by @ref where appropriate	2011-07-09 21:53:59 +02:00
viterbi.txt