Michael Niedermayer 63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' ... * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-03-28 11:20:41 +01:00
..
input.asm	Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'	2013-01-19 13:01:06 +01:00
Makefile	Merge remote-tracking branch 'qatar/master'	2012-07-23 21:25:09 +02:00
output.asm	Merge remote-tracking branch 'qatar/master'	2012-11-19 14:24:20 +01:00
rgb2rgb_template.c	Merge commit '652f5185945c8405fc57aed353286858df8d066f'	2012-10-31 14:02:35 +01:00
rgb2rgb.c	Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'	2012-11-01 13:11:51 +01:00
scale.asm	Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'	2012-10-31 13:57:09 +01:00
swscale_template.c	sws/x86: improve rounding for yuv2yuvX	2013-02-15 23:33:04 +01:00
swscale.c	Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'	2013-03-28 11:20:41 +01:00
w64xmmtest.c	win64: add a XMM clobber test configure option.	2012-02-02 12:00:48 -08:00
yuv2rgb_template.c	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
yuv2rgb.c	Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'	2012-11-01 13:11:51 +01:00