1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libswscale
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 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
libswscale.v swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
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 lavu: add FF_CEIL_RSHIFT and use it in various places. 2013-05-09 16:59:42 +02:00
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 Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
swscale.c Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557' 2013-08-29 15:56:03 +02:00
swscale.h Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491' 2013-05-07 11:04:07 +02:00
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