Michael Niedermayer 4c8bc6fdee Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' ...

* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/raw.c
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-04 21:48:00 +02:00

..

hscale_fast_bilinear_simd.c

swscale/x86/hscale_fast_bilinear_simd: add inline asm guards

2014-07-19 13:26:36 +02:00

input.asm

swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding

2014-06-22 03:09:28 +02:00

Makefile

sws: move inline asm hscale to MMX_OBJS

2014-07-19 05:53:42 +02:00

output.asm

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

rgb2rgb_template.c

swscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420

2014-07-13 05:48:09 +02:00

rgb2rgb.c

Add missing external declarations.

2014-03-17 00:48:09 +01:00

scale.asm

x86/scale: fix xmm register count for hscale*_sse2

2014-06-09 04:13:23 +02:00

swscale_template.c

sws/x86: split mmxext fast bilinear scaler out

2014-07-19 05:36:27 +02:00

swscale.c

Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'

2014-08-04 21:48:00 +02:00

w64xmmtest.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

yuv2rgb_template.c

inline asm: fix arrays as named constraints.

2014-05-07 15:02:45 +02:00

yuv2rgb.c

Fix compilation with !HAVE_6REGS.

2014-04-19 09:56:01 +02:00