1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale
Michael Niedermayer 1bdc212a39 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: link test programs with static libraries
  dct-test: remove unused variable cropTbl
  swscale: fix overflow in gray16 vertical scaling.
  get_bits: remove LAST_SKIP_CACHE macro
  swscale: fix integer overflows in RGB pixel writing.
  swscale: add endian conversion for RGB555 and RGB444 pixel formats
  swscale: fix overflows in output of RGB48 pixels.
  get_bits: remove strange/obsolete comments
  get_bits: whitespace (mostly) cosmetics
  swscale: add rgb565 endianess conversion
  get_bits: remove unnecessary #includes
  mp3dec: hack: fix decoding with safe bitstream reader
  fate: fix eatqi test
  adpcm: Check for channels to be a non-zero integer
  swscale: fix overflows in RGB rounding constants.
  get_bits: introduce safe bitreading to prevent overreads.

Conflicts:
	libswscale/swscale.c
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-18 03:04:44 +01:00
..
bfin
mlib
ppc
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
colorspace-test.c
libswscale.v
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
options.c
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rgb2rgb.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
swscale-test.c sws: update copyright dates 2011-11-18 21:44:26 +01:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
yuv2rgb.c sws: Fix warning: ‘abase’ may be used uninitialized in this function 2011-11-18 21:51:29 +01:00