Michael Niedermayer 688c3d944d Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  doxy: Define a group for libswscale documentation

Conflicts:
	libavutil/avutil.h
	libswscale/swscale.h

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

2013-12-14 13:09:30 +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

swscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined

2013-12-14 02:54:28 +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

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01: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 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

swscale/utils: fill xyz tables only when they will be used

2013-12-07 02:04:31 +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