Michael Niedermayer 3e48616226 Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c' ... * commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c': libswscale: fix compiler warnings enumerated type mixed with another type Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-03-16 00:15:16 +01:00
..
arm
ppc	ppc: libswscale: use LOCAL_ALIGNED instead of DECLARE_ALIGNED	2015-03-14 18:39:28 +01:00
x86	swscale: Add prefix to updateMMXDitherTables()	2015-02-27 19:23:46 +01:00
bayer_template.c	swscale/bayer_template: Add () to protect the argument of BAYER_READ()	2015-02-18 01:55:15 +01:00
colorspace-test.c
hscale_fast_bilinear.c
input.c	swscale/input: fix rgba64 alpha non native	2015-01-21 21:21:00 +01:00
libswscale.v
log2_tab.c
Makefile
options.c
output.c	swscale: Use av_clip_uintp2()	2015-02-21 14:49:17 +01:00
rgb2rgb_template.c	Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'	2014-10-18 23:40:50 +02:00
rgb2rgb.c
rgb2rgb.h
swscale_internal.h	swscale: Add prefix to updateMMXDitherTables()	2015-02-27 19:23:46 +01:00
swscale_unscaled.c	libswscale: fix compiler warnings enumerated type mixed with another type	2015-03-15 18:29:22 +01:00
swscale-test.c
swscale.c	Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c'	2015-03-16 00:15:16 +01:00
swscale.h
swscaleres.rc
utils.c	swscale/utils: Fix undefined shift in initFilter()	2015-03-11 15:40:28 +01:00
version.h
yuv2rgb.c	swscale/yuv2rgb: Use av_clip_uint8()	2015-02-21 14:44:47 +01:00