Michael Niedermayer 5710f55e49 Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015' ... * commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015': swscale: provide a default scaler if none is set Conflicts: libswscale/utils.c The default is left at bicubic until someone has compared the scalers properly speed and quality wise. Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-10-06 11:44:05 +02:00
..
bfin	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
ppc	ppc: don't return a value from a function declared void	2013-08-30 11:56:11 +02:00
sparc
x86	Reinstate proper FFmpeg license for all files.	2013-08-30 15:47:38 +00:00
colorspace-test.c
input.c
libswscale.v
Makefile
options.c	swscale/options: switch default to bicubic	2013-10-06 10:47:09 +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	Merge remote-tracking branch 'qatar/master'	2013-09-11 12:51:01 +02:00
swscale_internal.h	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
swscale_unscaled.c	swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1	2013-09-19 23:15:51 +02:00
swscale-test.c
swscale.c	Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'	2013-08-29 15:56:03 +02:00
swscale.h
utils.c	Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'	2013-10-06 11:44:05 +02:00
version.h	swscale/options: switch default to bicubic	2013-10-06 10:47:09 +02:00
yuv2rgb.c	swscale/yuv2rgb: make sure yuvTable is set to NULL after deallocation	2013-09-16 22:47:21 +02:00