Michael Niedermayer 3428a9b8d5 Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68' ...

* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
  swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

2014-04-02 17:46:19 +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

ppc: don't return a value from a function declared void

2013-08-30 11:56:11 +02:00

x86

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01: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: 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: add two spatially stable dithering methods

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

output.c

swscale: add two spatially stable dithering methods

2014-03-25 13:48:06 +01: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: add two spatially stable dithering methods

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

swscale_unscaled.c

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

2014-04-02 17:46:19 +02:00

swscale-test.c

Replace all occurrences of PRI in sscanf() calls with SCN

2013-04-10 09:56:48 +02:00

swscale.c

swscale/swscale: fix integer overflow

2014-03-24 05:01:32 +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

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

2014-04-02 17:46:19 +02:00

version.h

Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.

2014-03-19 09:11:22 +01:00

yuv2rgb.c

Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

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