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
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-04-10 22:53:25 +02:00
fate	Update reference for disabled fate-wmv8-x8intra test to new format.	2012-04-08 20:01:07 +02:00
lavf	avconv: get output pixel format from lavfi.	2012-04-15 20:22:36 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	vf_scale: ensure the palette is set for output.	2012-04-09 17:21:35 +02:00
seek	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
vsynth1	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00
vsynth2	Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'	2012-04-17 04:03:50 +02:00