Michael Niedermayer bb3ed3bae6 Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: Add FATE tests for the Ut Video encoder lavc: add Ut Video encoder mpegvideo_enc: remove stray duplicate line from 7f9aaa4 swscale: x86: fix #endif comments in rgb2rgb template file avconv: mark more options as expert. avconv: split printing "main options" into global and per-file. avconv: refactor help printing. Conflicts: Changelog ffmpeg_opt.c ffserver.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-20 17:31:55 +02:00
..
doxy
examples	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
APIchanges	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
avtools-common-opts.texi	Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'	2012-08-20 17:06:50 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi	lavf/img2dec: add and document pattern_type option	2012-08-08 23:43:36 +02:00
developer.texi	Merge remote-tracking branch 'qatar/master'	2012-08-17 17:06:52 +02:00
encoders.texi
errno.txt
eval.texi
faq.texi	faq: suggest the concat filter.	2012-07-28 18:16:55 +02:00
fate.texi
ffmpeg.texi	Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'	2012-08-20 16:55:08 +02:00
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffprobe.xsd	ffprobe: fix validity error with tags and data.	2012-07-31 15:06:57 +02:00
ffserver.conf
ffserver.texi
filter_design.txt	filter_design: document ownership and permissions.	2012-08-14 12:12:20 +02:00
filters.texi	lavfi: add volumedetect filter.	2012-08-19 11:37:05 +02:00
general.texi	Merge remote-tracking branch 'qatar/master'	2012-08-20 17:31:55 +02:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +02:00
git-howto.txt
indevs.texi	doc/indevs: document missing options in x11grab section	2012-08-08 23:43:37 +02:00
issue_tracker.txt
Makefile	doc/Makefile: add doc target, as an alias for "documentation"	2012-08-18 10:04:25 +02:00
metadata.texi
mips.txt	mips: change list of files with MIPS copyright notice in mips.txt	2012-08-17 18:54:50 +02:00
multithreading.txt
muxers.texi	doc/muxers: simplify segment examples	2012-08-18 12:32:54 +02:00
optimization.txt
outdevs.texi	lavd/caca: rename "colors" option to "color"	2012-07-22 10:31:33 +02:00
platform.texi	Merge remote-tracking branch 'qatar/master'	2012-08-10 16:25:23 +02:00
print_options.c
protocols.texi	Merge remote-tracking branch 'qatar/master'	2012-08-17 17:06:52 +02:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi
t2h.init	doc: declare encoding for texi2html.	2012-07-22 12:48:57 +02:00
tablegen.txt
texi2pod.pl	doc/texi2pod: add "use warnings" directive	2012-08-12 23:52:55 +02:00
viterbi.txt