Michael Niedermayer ef25595b71 Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5' ...

* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
  swscale/x86/rgb2rgb: add support for AVX

Conflicts:
	libswscale/x86/rgb2rgb_template.c

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

2014-01-21 22:03:28 +01:00

..

input.asm

Reinstate proper FFmpeg license for all files.

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

Makefile

Merge commit 'a519583991c38d38503ab08357716513facc5725'

2013-08-29 14:42:34 +02:00

output.asm

Reinstate proper FFmpeg license for all files.

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

rgb2rgb_template.c

Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'

2014-01-21 22:03:28 +01:00

rgb2rgb.c

swscale/x86/rgb2rgb: add support for AVX

2014-01-21 18:01:29 +01:00

scale.asm

Reinstate proper FFmpeg license for all files.

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

swscale_template.c

Merge commit 'a519583991c38d38503ab08357716513facc5725'

2013-08-29 14:42:34 +02:00

swscale.c

Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'

2014-01-14 14:44:59 +01:00

w64xmmtest.c

Reinstate proper FFmpeg license for all files.

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

yuv2rgb_template.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

yuv2rgb.c

Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'

2014-01-14 14:44:59 +01:00