Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Dec 2011 01:23:57 +0000 (02:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Dec 2011 02:04:44 +0000 (03:04 +0100)
commit1bdc212a39312bd5914d643a4e664b4599477d8c
tree19fcd489c7ec86908e240f1d6f6752d587dc97e7
parent1a2484fc4e5c5effc32c55c2f25670ec23cbf57b
parent0ea5b44275aa334528eb384a6548cc9f98c50a17
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>
12 files changed:
configure
libavcodec/adpcm.c
libavcodec/dct-test.c
libavcodec/get_bits.h
libavcodec/mpeg4videodec.c
libavcodec/mpegaudiodec.c
libavcodec/msmpeg4.c
libavcodec/wmavoice.c
library.mak
libswscale/swscale.c
libswscale/swscale_unscaled.c
tests/fate.mak