FFmpeg/libswscale
Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03 09:16:36 +02:00
..
bfin Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ppc Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
sparc Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 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 '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 Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
output.c swscale/output: silence warning about undefined 'ASSERT_LEVEL' 2013-05-19 14:06:16 +00: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 libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
swscale_unscaled.c Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper() 2013-06-11 01:14:38 +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 libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
swscale.h Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491' 2013-05-07 11:04:07 +02:00
utils.c swscale/fill_rgb2yuv_table: fix default detection 2013-07-27 01:11:37 +02:00
version.h swscale: Add support to specify chroma position 2013-07-17 01:59:10 +02:00
yuv2rgb.c swscale: RGBA64 output 2013-05-12 21:47:19 +02:00