ffmpeg/libswscale
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 swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
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 Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
hscale_fast_bilinear.c sws: Move fast bilinear C code into seperate file 2014-07-19 05:36:26 +02:00
input.c swscale/input: fix rgba64 alpha non native 2015-01-21 21:21:00 +01:00
libswscale.v swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
log2_tab.c lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
Makefile lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
options.c swscale: Allow chroma samples to be above and to the left of luma samples 2014-09-21 12:23:24 +02:00
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 Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01:00
rgb2rgb.h swscale: add nv12/nv21->yuv420 converter 2014-01-21 17:55:07 +01:00
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 Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820' 2014-08-04 22:32:13 +02:00
swscale.c Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c' 2015-03-16 00:15:16 +01:00
swscale.h Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 2014-08-07 20:52:40 +02:00
swscaleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c swscale/utils: Fix undefined shift in initFilter() 2015-03-11 15:40:28 +01:00
version.h swscale: support internal scaler cascades 2014-10-11 05:05:17 +02:00
yuv2rgb.c swscale/yuv2rgb: Use av_clip_uint8() 2015-02-21 14:44:47 +01:00