• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e986a5d1
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e986a5d1
h264.c 167 KB