FFmpeg/libswscale
Michael Niedermayer 1ef0b8f9cc Merge commit 'd258531502'
* commit 'd258531502':
  swscale: Mark a bunch of tables only used within one file static

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-16 12:40:32 +02:00
..
bfin Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
ppc Merge commit 'c011ceef78' 2013-06-03 11:53:05 +02:00
sparc Merge commit '716d413c13' 2012-10-08 21:06:57 +02:00
x86 swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
colorspace-test.c Merge commit 'd488c3bcba' 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 sws: add dither enum 2013-08-15 21:39:32 +02:00
output.c sws: add dither enum 2013-08-15 21:39:32 +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
rgb2rgb_template.c lavu: add FF_CEIL_RSHIFT and use it in various places. 2013-05-09 16:59:42 +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 'd258531502' 2013-08-16 12:40:32 +02:00
swscale.h Merge commit 'c1eb3e7fec' 2013-05-07 11:04:07 +02:00
swscale_internal.h Merge commit 'd258531502' 2013-08-16 12:40:32 +02:00
swscale_unscaled.c Merge commit 'd258531502' 2013-08-16 12:40:32 +02:00
utils.c sws: add dither enum 2013-08-15 21:39:32 +02:00
version.h sws: add dither enum 2013-08-15 21:39:32 +02:00
yuv2rgb.c swscale: RGBA64 output 2013-05-12 21:47:19 +02:00