Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Jan 2012 01:22:09 +0000 (02:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Jan 2012 01:22:09 +0000 (02:22 +0100)
commite986a5d10d95b62cd85aaefc7d4da34699fbedeb
tree38dddca2b4582111bcf1bcb6be2d1c6193300f2d
parent36397ea1c7e27ab850149cc61394c2baa26dd532
parent68d6012c723bb520daac5336dcb046c0a5dd3826
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add tests for targa
  ARM: fix Thumb-mode simple_idct_arm
  ARM: 4-byte align start of all asm functions
  rgb2rgb: rgb12to15()
  swscale-test: fix stack overread.
  swscale: fix invalid conversions and memory problems.
  cabac: split cabac.h into declarations and function definitions
  cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
  cabac: Remove ff_h264_lps_state array.

Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/asm.S
libavcodec/arm/simple_idct_arm.S
libavcodec/cabac.c
libavcodec/cabac.h
libavcodec/h264.c
libavcodec/h264_cabac.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
libswscale/swscale-test.c
libswscale/swscale_unscaled.c
tests/fate/image.mak