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
..
fate	Allow running fate-wmv8-x8intra manually.	2012-04-08 20:27:35 +02:00
ref	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	latmenc: fix muxing of byte-aligned DSE.	2012-04-12 20:27:47 +02:00
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
lena.pnm
Makefile	Allow manually running disabled FATE tests.	2012-04-08 20:27:35 +02:00
md5.sh
regression-funcs.sh	Add nellymoser "fuzzy" FATE test.	2012-04-08 02:43:56 +02:00
rotozoom.c
tiny_psnr.c	tiny_psnr: reindent after last commit.	2012-04-15 15:46:46 +02:00
videogen.c