Michael Niedermayer 8733b363ac Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949' ...

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
	libswscale/x86/rgb2rgb.c
	libswscale/x86/swscale.c

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

2013-11-23 12:10:40 +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

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

x86

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

2013-11-23 12:10:40 +01:00

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

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

input.c

swscale: remove unneeded include assert.h

2013-07-19 18:52:41 +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

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

swscale: add nv12/nv21->yuv420 converter

2013-11-19 15:13:48 +01:00

rgb2rgb.c

swscale: add nv12/nv21->yuv420 converter

2013-11-19 15:13:48 +01:00

rgb2rgb.h

swscale: add nv12/nv21->yuv420 converter

2013-11-19 15:13:48 +01:00

swscale_internal.h

Optimize pure C unscaled yuv2rgb.

2013-10-30 20:52:24 +01:00

swscale_unscaled.c

swscale: fix used stride in planarToNv12Wrapper()

2013-11-19 15:13:48 +01:00

swscale-test.c

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

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

swscale.c

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

2013-08-29 15:56:03 +02:00

swscale.h

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

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

utils.c

lsws/utils: introduce scale_algorithms array

2013-11-05 14:01:53 +01:00

version.h

swscale/options: switch default to bicubic

2013-10-06 10:47:09 +02:00

yuv2rgb.c

swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

2013-10-17 14:02:43 +02:00