Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' ... * commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-03 09:16:36 +02:00
..
bfin
ppc
sparc
x86
colorspace-test.c
input.c
libswscale.v
Makefile
options.c	Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'	2013-08-03 09:16:36 +02:00
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h
swscale_unscaled.c
swscale-test.c
swscale.c
swscale.h
utils.c
version.h
yuv2rgb.c