Michael Niedermayer 28875c4188 Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad' ...

* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-13 01:26:49 +02: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 'da785231ea0b82b5c2526babbb2871c935b21a87'

2014-03-14 01:56:25 +01:00

ppc

…

x86

sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

2014-04-10 02:07:07 +02:00

bayer_template.c

libswscale: bayer to rgb24 & yv12 colorspace converters

2014-02-23 02:38:22 +01:00

colorspace-test.c

…

input.c

swscale/input: replace assert() by av_assert1()

2014-04-09 05:14:34 +02:00

libswscale.v

…

Makefile

…

options.c

swscale: add two spatially stable dithering methods

2014-03-25 13:48:06 +01:00

output.c

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

2014-04-09 03:36:38 +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

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

2014-04-09 03:36:38 +02:00

swscale_unscaled.c

Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

2014-04-13 01:26:49 +02:00

swscale-test.c

…

swscale.c

Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

2014-04-13 01:26:49 +02:00

swscale.h

Merge remote-tracking branch 'qatar/master'

2013-12-14 13:09:30 +01:00

swscaleres.rc

…

utils.c

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

2014-04-09 03:36:38 +02:00

version.h

swscale: add full bgra64 support

2014-04-02 19:44:08 +02:00

yuv2rgb.c

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

2014-03-13 22:35:47 +01:00