ffmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Hack around gcc 4.6 breaking asm using call. 2011-09-20 19:05:51 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-13 23:44:12 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
rgb2rgb.c lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
rgb2rgb.h lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
swscale_internal.h swscale: drop redundant code. 2011-09-14 00:32:18 +02:00
swscale_unscaled.c sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
swscale-test.c swscale: Remove commented-out printf cruft. 2011-05-28 11:09:30 +02:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-09-15 23:10:26 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00