Michael Niedermayer a7758884db Merge remote-tracking branch 'qatar/master' ... * qatar/master: rtp: factorize dynamic payload type fallback flvdec: Ignore the index if it's from a creator known to be different cmdutils: move grow_array out of #if CONFIG_AVFILTER avconv: actually set InputFile.rate_emu ratecontrol: update last_qscale_for sooner Fix unnecessary shift with 9/10bit vertical scaling prores: mark prores as intra-only in libavformat/utils.c:is_intra_only() prores: return more meaningful error values prores: improve error message wording prores: cosmetics: prettyprinting, drop useless parentheses prores: lowercase AVCodec name entry Conflicts: cmdutils.c libavcodec/proresdec_lgpl.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-09-24 01:03:07 +02:00
..
acodec	rematrix: dont use floats for int16 code.	2011-09-19 09:25:50 +02:00
fate	Merge remote-tracking branch 'qatar/master'	2011-09-23 00:35:31 +02:00
lavf	rematrix: dont use floats for int16 code.	2011-09-19 09:25:50 +02:00
lavfi	Merge remote-tracking branch 'qatar/master'	2011-09-24 01:03:07 +02:00
seek	ffmdec: fix seeking for non indexed files	2011-09-08 20:53:37 +02:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2011-09-24 01:03:07 +02:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2011-09-24 01:03:07 +02:00