Michael Niedermayer 01cac26f68 Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557' ... * commit '1909f6b1b6da2db371c179bed5a19aaf979b7557': swscale: cosmetics: Drop silly camelCase from swScale function pointer name Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-29 15:56:03 +02:00
..
bfin	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
ppc	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
sparc
x86	Merge commit 'a519583991c38d38503ab08357716513facc5725'	2013-08-29 14:42:34 +02:00
colorspace-test.c
input.c	swscale: remove unneeded include assert.h	2013-07-19 18:52:41 +02:00
libswscale.v
Makefile
options.c	sws: add dither enum	2013-08-15 21:39:32 +02:00
output.c	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'	2013-08-16 12:56:48 +02:00
rgb2rgb_template.c
rgb2rgb.c	Merge commit 'a519583991c38d38503ab08357716513facc5725'	2013-08-29 14:42:34 +02:00
rgb2rgb.h
swscale_internal.h	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
swscale_unscaled.c	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
swscale-test.c
swscale.c	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
swscale.h
utils.c	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
version.h	sws: add dither enum	2013-08-15 21:39:32 +02:00
yuv2rgb.c	Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'	2013-08-29 15:41:05 +02:00