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
..
amv	regtests: amv video encoder test	2011-09-25 12:29:20 +02:00
asv1	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
asv2	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
cljr	cljr: set the properties of the coded_frame, not input frame.	2012-02-12 08:05:38 +01:00
dnxhd_720p	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
dnxhd_720p_10bit	Fix unnecessary shift with 9/10bit vertical scaling	2011-09-23 02:13:30 +02:00
dnxhd_720p_rd	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
dnxhd_1080i	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
dv	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
dv50	dv: honor timecode in DV muxer.	2011-08-13 19:13:03 +02:00
dv_411	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
error	error_resilience: actually add counter when adding a MV predictor.	2011-06-20 22:18:23 +02:00
ffv1	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
ffvhuff	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00
flashsv	swscale: Do not loose precission on yuv values after rgb->yuv.	2011-05-26 22:00:40 +02:00
flashsv2	fate: use compression level 0 for flashsv2 tests.	2012-02-04 19:59:40 +01:00
flv	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
h261	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
h263	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
h263p	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
huffyuv	avienc: Fix rawvideo 32bit	2011-12-17 03:25:46 +01:00
jpeg2000	regression tests: add jpeg2000	2011-09-27 21:32:39 +02:00
jpegls	swscale: Do not loose precission on yuv values after rgb->yuv.	2011-05-26 22:00:40 +02:00
ljpeg	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mjpeg	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mpeg	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mpeg1b	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mpeg2	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg2_422	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg2_idct_int	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg2_ilace	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg2_ivlc_qprd	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg2thread	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
mpeg2thread_ilace	Merge remote-tracking branch 'qatar/master'	2011-11-23 04:02:17 +01:00
mpeg4	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
mpeg4_adap	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg4_qpel	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg4_qprd	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg4adv	regtest: split video encode/decode tests into individual targets	2011-11-22 12:13:04 +00:00
mpeg4nr	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mpeg4thread	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
mpng	Add tests for several encoders.	2011-12-05 20:05:44 +01:00
msmpeg4	Make MP43 the default fourcc for msmpeg4v3:	2010-07-20 09:44:21 +00:00
msmpeg4v2	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
msvideo1	Set bits_per_coded_sample when encoding Microsoft Video-1.	2012-04-15 16:35:03 +02:00
prores	prores: store and retrieve extended colourspace information	2012-02-29 09:29:02 +01:00
prores_kostya	Merge remote-tracking branch 'qatar/master'	2012-03-01 03:17:11 +01:00
qtrle	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
qtrlegray	movenc: Decrease default chunk merge limit to 1mb.	2012-01-23 23:41:32 +01:00
r210	r210enc: don't write uninitialized data	2012-01-29 21:00:19 +01:00
rc	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
rgb	swscale: Do not loose precission on yuv values after rgb->yuv.	2011-05-26 22:00:40 +02:00
roq	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
rv10	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
rv20	Fix rv20 encoding so the binary decoder can decode it.	2010-09-26 01:56:48 +00:00
snow	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
snowll	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
svq1	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
v210	fate: Add v210 codec regression tests	2011-12-28 20:50:41 +01:00
v308	fate: add v308 encoding/decoding test	2012-01-29 18:11:40 +01:00
v408	Add v408 codec regression test.	2012-04-09 00:46:43 +02:00
vref	fate: run aref and vref as regular tests	2011-05-18 14:45:46 +01:00
wmv1	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
wmv2	tiny_psnr: print max absolute difference between files	2010-07-09 00:40:37 +00:00
y41p	fate: add Y41P encoding/decoding test	2012-01-29 02:41:09 +01:00
yuv	avienc: Fix rawvideo 32bit	2011-12-17 03:25:46 +01:00
yuv4	fate: add yuv4 encoding/decoding test	2012-01-29 18:11:40 +01:00
zlib	Add tests for several encoders.	2011-12-05 20:05:44 +01:00
zmbv	vf_scale: ensure the palette is set for output.	2012-04-09 17:21:35 +02:00