2 Commits

Author	SHA1	Message	Date
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
Michael Niedermayer	93c220e895	forgot git add prores_*c ... Authorship of the decoders is elvis / maxim. For more details see previous comits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2011-09-23 01:12:29 +02:00