ffmpeg/libswscale
Michael Niedermayer 2af8f2cea6 Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
  cmdutils: use new avcodec_is_decoder/encoder() functions.
  lavc: make codec_is_decoder/encoder() public.
  lavc: deprecate AVCodecContext.sub_id.
  libcdio: add a forgotten AVClass to the private context.
  swscale: remove "cpu flags" from -sws_flags description.
  proresenc: give user a possibility to alter some encoding parameters
  vorbisenc: add output buffer overwrite protection
  libopencore-amrnbenc: fix end-of-stream handling
  ra144enc: fix end-of-stream handling
  nellymoserenc: zero any leftover packet bytes
  nellymoserenc: use proper MDCT overlap delay
  qpeg: Use bytestream2 functions to prevent buffer overreads.
  swscale: make %rep unconditional.
  vp8: convert simple loopfilter x86 assembly to use named arguments.
  vp8: convert idct x86 assembly to use named arguments.
  vp8: convert mc x86 assembly to use named arguments.
  vp8: convert loopfilter x86 assembly to use cpuflags().
  vp8: convert idct/mc x86 assembly to use cpuflags().
  swscale: remove now unnecessary hack.
  x86inc: don't "bake" stack_offset in named arguments.
  ...

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/qpeg.c
	libavcodec/utils.c
	libavcodec/version.h
	libavdevice/libcdio.c
	tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-05 00:15:55 +01:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
sparc Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Support RGBA64 as input colour space. 2012-03-04 00:43:18 +01:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
output.c Fix alpha overflow when converting from RGBA64 to RGBA. 2012-03-04 13:42:16 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
swscale-test.c Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
utils.c Support RGBA64 as input colour space. 2012-03-04 00:43:18 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00