FFmpeg/libswscale
Michael Niedermayer 53feab7a4e Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

See: ef627bf9ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:55:20 +01:00
..
arm swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
bfin Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557' 2013-08-29 15:56:03 +02:00
ppc ppc: don't return a value from a function declared void 2013-08-30 11:56:11 +02:00
sparc
x86 Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7' 2014-01-14 14:44:59 +01:00
colorspace-test.c
input.c swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
libswscale.v
Makefile Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
options.c swscale/options: switch default to bicubic 2013-10-06 10:47:09 +02:00
output.c Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3' 2013-08-16 12:56:48 +02:00
rgb2rgb_template.c Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01: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: NEON optimized unscaled rgba to nv12 conversion 2013-12-16 00:47:39 +01:00
swscale_unscaled.c swscale: add nv12/nv21->yuv420 converter 2014-01-21 17:55:07 +01:00
swscale-test.c
swscale.c swscale: fix rgb48Toxyz12() endianness 2014-01-10 17:26:39 +01:00
swscale.h Merge remote-tracking branch 'qatar/master' 2013-12-14 13:09:30 +01:00
swscaleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c swscale/utils: fix wrong deprecated message with rgb0 2013-12-24 22:47:49 +01:00
version.h Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' 2013-12-27 12:01:23 +01:00
yuv2rgb.c swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast 2013-10-17 14:02:43 +02:00