Michael Niedermayer c14fc4585c Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3' ... * commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3': swscale: Move extern declarations for tables to swscale_internal.h Conflicts: libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-08-16 12:56:48 +02:00
..
bfin
ppc	Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'	2013-06-03 11:53:05 +02:00
sparc
x86	swscale: remove unneeded include assert.h	2013-07-19 18:52:41 +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	lavu: add FF_CEIL_RSHIFT and use it in various places.	2013-05-09 16:59:42 +02:00
rgb2rgb.c	sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables	2013-04-15 03:08:37 +02:00
rgb2rgb.h	sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables	2013-04-15 03:08:37 +02:00
swscale_internal.h	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'	2013-08-16 12:56:48 +02:00
swscale_unscaled.c	Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'	2013-08-16 12:40:32 +02:00
swscale-test.c	Replace all occurrences of PRI in sscanf() calls with SCN	2013-04-10 09:56:48 +02:00
swscale.c	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'	2013-08-16 12:56:48 +02:00
swscale.h	Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'	2013-05-07 11:04:07 +02:00
utils.c	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'	2013-08-16 12:56:48 +02:00
version.h	sws: add dither enum	2013-08-15 21:39:32 +02:00
yuv2rgb.c	Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'	2013-08-16 12:56:48 +02:00