Michael Niedermayer f2db5602ba Merge branch 'ronalds_buggy_gt8bit_sws' ...

* ronalds_buggy_gt8bit_sws:
  swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit 81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
  swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit e0b8fff6c7a293e35079ba1931bd19372686b3f6)
  swscale: implement >8bit scaling support.

Conflicts:
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

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

2011-07-11 03:49:33 +02:00

..

bfin

Merge remote-tracking branch 'qatar/master'

2011-06-22 05:16:40 +02:00

mlib

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

ppc

Merge branch 'ronalds_buggy_gt8bit_sws'

2011-07-11 03:49:33 +02:00

sparc

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

x86

Merge branch 'ronalds_buggy_gt8bit_sws'

2011-07-11 03:49:33 +02:00

colorspace-test.c

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

libswscale.v

Add symbol versioning for shared libraries

2010-01-16 04:48:55 +00:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-06-29 05:23:12 +02:00

options.c

Merge remote-tracking branch 'qatar/master'

2011-05-25 06:32:45 +02:00

rgb2rgb_template.c

Merge remote-tracking branch 'qatar/master'

2011-05-30 01:29:11 +02:00

rgb2rgb.c

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

rgb2rgb.h

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

swscale_internal.h

Merge branch 'ronalds_buggy_gt8bit_sws'

2011-07-11 03:49:33 +02:00

swscale_template.c

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +02:00

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +02:00

swscale-test.c

swscale: Remove commented-out printf cruft.

2011-05-28 11:09:30 +02:00

swscale.c

Merge branch 'ronalds_buggy_gt8bit_sws'

2011-07-11 03:49:33 +02:00

swscale.h

Merge remote-tracking branch 'qatar/master'

2011-06-21 03:38:25 +02:00

utils.c

Merge branch 'ronalds_buggy_gt8bit_sws'

2011-07-11 03:49:33 +02:00

yuv2rgb.c

swscale: remove sws_format_name()

2011-05-30 09:07:43 +02:00