Michael Niedermayer dce12f6948 Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c' ...

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

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

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

2013-05-07 11:13:46 +02:00

..

bfin

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ppc

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

sparc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

x86

Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

2013-05-05 13:00:21 +02:00

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

input.c

sws: move RGB2YUV_SHIFT to swscale_internal.h

2013-04-15 01:23:29 +02:00

libswscale.v

swscale: Do not make ff_ symbols globally visible.

2012-10-10 02:08:01 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

options.c

sws: add AVOption flag for error diffusion dither

2013-01-19 02:38:48 +01:00

output.c

swscale/output: fix alpha scale in the new functions

2013-04-14 16:57:09 +02:00

rgb2rgb_template.c

Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

2013-05-05 13:00:21 +02:00

rgb2rgb.c

sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables

2013-04-15 03:08:37 +02:00

rgb2rgb.h

sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables

2013-04-15 03:08:37 +02:00

swscale_internal.h

sws: share xyzgamma tables.

2013-05-01 17:52:18 +02:00

swscale_unscaled.c

swscale: support endianness conversion for AV_PIX_FMT_XYZ12

2013-05-06 21:48:14 +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

sws: fix typo in xyz2rgb matrix use.

2013-04-28 19:57:45 +02:00

swscale.h

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

2013-05-07 11:04:07 +02:00

utils.c

Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

2013-05-07 11:13:46 +02:00

version.h

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

2013-05-07 11:04:07 +02:00

yuv2rgb.c

Merge remote-tracking branch 'qatar/master'

2013-05-06 21:48:03 +02:00