1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale/x86
Michael Niedermayer 4640da7e58 Merge remote-tracking branch 'qatar/master'
* 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 9c2f9b0e2
  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: Michael Niedermayer <michaelni@gmx.at>
2012-01-15 01:16:54 +01:00
..
input.asm Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-01-15 01:16:54 +01:00
rgb2rgb_template.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
rgb2rgb.c Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX). 2011-11-09 01:58:22 +01:00
scale.asm Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
swscale_mmx.c Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2012-01-11 02:44:43 +01:00
yuv2rgb_mmx.c x86/yuv2rgb_mmx: Remove yuv420 check. 2012-01-14 21:42:56 +01:00
yuv2rgb_template.c sws: yuv2rgb asm, add memory clobber. 2012-01-12 16:32:55 +01:00