ffmpeg/libswscale/x86
Michael Niedermayer 367d9b2957 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: K&R formatting cosmetics (part II)
  tiffdec: Add a malloc check and refactor another.
  faxcompr: Check malloc results and unify return path
  configure: escape colons in values written to config.fate
  ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
  matroska: Fix leaking memory allocated for laces.
  pthread: Fix crash due to fctx->delaying not being cleared.
  vp3: Assert on invalid filter_limit values.
  h264: fix 10bit biweight functions after recent x86inc.asm fixes.
  ffv1: Fix size mismatch in encode_line.
  movenc: Remove a dead initialization
  git-howto: Explain how to avoid Windows line endings in git checkouts.
  build: Move all arch OBJS declarations into arch subdirectory Makefiles.

Conflicts:
	configure
	libavcodec/vp3.c
	libavformat/matroskadec.c
	libavutil/Makefile
	libswscale/Makefile
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-13 21:50:37 +02:00
..
input.asm
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
rgb2rgb_template.c
rgb2rgb.c
scale.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
swscale_mmx.c
swscale_template.c
w64xmmtest.c
yuv2rgb_mmx.c
yuv2rgb_template.c