ffmpeg/libswscale
Michael Niedermayer cac9877ed5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
  include stdint.h in adpcm_data.h
  mpeg12: reorder functions to avoid ugly forward declarations
  Fixed off by one packet size allocation in the smacker demuxer.
  Check for invalid packet size in the smacker demuxer.
  ape demuxer: fix segfault on memory allocation failure.
  xan: Add some buffer checks
  xan: Remove extra trailing newline
  Fixed size given to init_get_bits() in xan decoder.

Conflicts:
	libavcodec/mpeg12.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-13 23:44:12 +02:00
..
bfin Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-09-13 23:44:12 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v
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 Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +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 sws: fix a huge amount of incompatible pointer type arguments warnings. 2011-09-01 20:23:40 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
utils.c sws: remove hScale16N() and use ronalds reformated version of it. 2011-08-14 19:34:48 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00