Michael Niedermayer 4778783160 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' ... * commit '3b266da3d35f3f7a61258b78384dfe920d875d29': avconv: add support for complex filtergraphs. avconv: make filtergraphs global. avconv: move filtered_frame from InputStream to OutputStream. avconv: don't set output width/height directly from input value. avconv: move resample_{width,height,pix_fmt} to InputStream. avconv: remove a useless variable from OutputStream. avconv: get output pixel format from lavfi. graphparser: fix the order in which unlabeled input links are returned. avconv: change {input,output}_{streams,files} into arrays of pointers. avconv: don't pass input/output streams to some functions. Conflicts: cmdutils.c cmdutils.h doc/ffmpeg.texi ffmpeg.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-17 04:03:50 +02:00
..
doxy	doxygen: cleanup style to support older doxy	2011-12-29 17:19:46 +01:00
examples	examples/decoding_encoding: remove unused variable "size"	2012-04-13 00:13:31 +02:00
APIchanges	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
avtools-common-opts.texi	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
avutil.txt
bitstream_filters.texi	Merge remote-tracking branch 'qatar/master'	2012-02-25 04:00:43 +01:00
build_system.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
decoders.texi	lavc: add ffwavesynth pseudo-codec.	2011-12-15 18:38:04 +01:00
demuxers.texi	lavf: add SBG demuxer.	2011-12-15 18:38:06 +01:00
developer.texi	Merge remote-tracking branch 'qatar/master'	2012-04-15 23:31:51 +02:00
encoders.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
errno.txt	doc: add a list of errno codes on some systems.	2011-12-21 19:59:45 +01:00
eval.texi	eval: add root() to solve f(x)=0	2012-02-27 00:00:55 +01:00
faq.texi	faq: fix typo.	2012-01-24 16:03:09 +01:00
fate.texi	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
ffmpeg.txt	Fix "ouput" typo and add a check.	2012-01-28 11:04:19 +01:00
ffplay.texi	ffplay: add 10 minute seek support to ffplay	2011-12-14 21:09:08 +01:00
ffprobe.texi	ffprobe: add count_frames and count_packets options	2012-02-17 01:06:43 +01:00
ffprobe.xsd	ffprobe: report bit rate in stream description	2012-02-20 17:46:26 +01:00
ffserver.conf	Merge remote-tracking branch 'qatar/master'	2012-02-10 01:20:07 +01:00
ffserver.texi	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
filters.texi	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
general.texi	lavc: add a OpenEXR decoder	2012-04-06 08:32:09 +02:00
git-howto.texi	Merge remote-tracking branch 'qatar/master'	2012-04-13 21:50:37 +02:00
git-howto.txt	githowto: git is generally available as package in most distros.	2011-11-23 23:03:37 +01:00
indevs.texi	v4l2: allow to convert monotonic timestamps.	2012-04-04 15:22:44 +02:00
issue_tracker.txt
libavfilter.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
Makefile	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
metadata.texi
multithreading.txt
muxers.texi	doc/muxers: add documentation for the md5 and framemd5 muxers	2012-04-07 13:57:40 +02:00
optimization.txt
outdevs.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
platform.texi	Fix a bunch of platform name and other typos.	2012-01-11 13:48:30 +01:00
print_options.c	Generate manpages for AV{Format,Codec}Context AVOptions.	2012-03-20 07:10:06 +01:00
protocols.texi	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
rate_distortion.txt
RELEASE_NOTES	RELEASE_NOTES: update for 0.10	2012-01-26 21:59:09 +01:00
snow.txt
soc.txt	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
swresample.txt	cosmetics: fix some typos	2012-03-13 01:14:04 +01:00
swscale.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
t2h.init	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
tablegen.txt
texi2pod.pl	doc: texi2pod: add -I flag	2012-03-20 11:10:25 +00:00
viterbi.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00