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
..
crop
crop_scale
crop_scale_vflip
crop_vflip
null
pixdesc	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
pixfmts_copy	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
pixfmts_crop	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
pixfmts_hflip	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
pixfmts_null	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
pixfmts_pad
pixfmts_scale	Merge remote-tracking branch 'qatar/master'	2011-09-24 01:03:07 +02:00
pixfmts_vflip	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
scale200
scale500
vflip
vflip_crop
vflip_vflip