• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4640da7e
    Michael Niedermayer authored
    * qatar/master:
      sgidec: Use bytestream2 functions to prevent buffer overreads.
      cosmetics: Move static and inline attributes to more standard places.
      configure: provide libavfilter/version.h header to get_version()
      swscale: change yuv2yuvX code to use cpuflag().
      libx264: Don't leave max_b_frames as -1 if the user didn't set it
      FATE: convert output to rgba for the targa tests which currently output pal8
      fate: add missing reference files for targa tests in 9c2f9b0e
      FATE: enable the 2 remaining targa conformance suite tests
      targa: add support for rgb555 palette
      FATE: fix targa tests on big-endian systems
    
    Conflicts:
    	libavcodec/sgidec.c
    	libavcodec/targa.c
    	libswscale/x86/output.asm
    	tests/fate/image.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4640da7e
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...