• 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
Name
Last commit
Last update
..
bfin Loading commit data...
mlib Loading commit data...
ppc Loading commit data...
sparc Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
colorspace-test.c Loading commit data...
libswscale.v Loading commit data...
options.c Loading commit data...
rgb2rgb.c Loading commit data...
rgb2rgb.h Loading commit data...
rgb2rgb_template.c Loading commit data...
swscale-test.c Loading commit data...
swscale.c Loading commit data...
swscale.h Loading commit data...
swscale_internal.h Loading commit data...
swscale_unscaled.c Loading commit data...
utils.c Loading commit data...
yuv2rgb.c Loading commit data...