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
..
bfin
ppc
sparc
x86	Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'	2013-03-28 11:20:41 +01:00
colorspace-test.c
input.c
libswscale.v
Makefile
options.c
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h
swscale_unscaled.c	Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'	2013-03-12 15:44:15 +01:00
swscale-test.c
swscale.c
swscale.h
utils.c
version.h
yuv2rgb.c