ffmpeg/libswscale/x86
Michael Niedermayer 4c677df27c Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  frwu: Employ more meaningful return values.
  fraps: Use av_fast_padded_malloc() instead of av_realloc()
  mjpegdec: use av_fast_padded_malloc()
  eatqi: use av_fast_padded_malloc()
  asv1: use av_fast_padded_malloc()
  avcodec: Add av_fast_padded_malloc().
  swscale: enable dithering in MMX functions.
  swscale: make rgb24 function macros slightly smaller.
  avcodec.h: Remove some disabled cruft.
  swscale: remove obsolete comment.
  swscale-test: Drop unused argc and argv arguments from main().
  zmbv: Employ more meaningful return values.
  zmbvenc: Employ more meaningful return values.
  vc1: prevent null pointer dereference on broken files
  zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
  truespeech: align buffer
  ac3: Do not read past the end of ff_ac3_band_start_tab.
  dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
  dv: Fix null pointer dereference due to ach=0
  dv: check stype
  ...

Conflicts:
	doc/APIchanges
	libavcodec/asv1.c
	libavcodec/avcodec.h
	libavcodec/eatqi.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/zmbv.c
	libavformat/dv.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-02 02:24:09 +01:00
..
input.asm Merge remote-tracking branch 'qatar/master' 2012-02-02 02:24:09 +01:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +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-28 07:53:34 +01:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-02 02:24:09 +01:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +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