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

…

bfin

Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

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

ppc

…

x86

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

2014-03-26 14:50:55 +01:00

bayer_template.c

…

colorspace-test.c

…

input.c

…

libswscale.v

…

Makefile

…

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

…

rgb2rgb.c

…

rgb2rgb.h

…

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

…

swscale.c

swscale/swscale: fix integer overflow

2014-03-24 05:01:32 +01:00

swscale.h

…

swscaleres.rc

…

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