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
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 Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 2013-08-03 09:16:36 +02:00
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
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
swscale.c libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
swscale.h
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