Michael Niedermayer 92afb43162 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  snow: split snow in snowdec and snowenc
  tiffenc: deprecate using compression_level
  swscale: fix failing fate tests.
  swscale: add support for planar RGB input.
  h264: add support for decoding planar RGB images.
  Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
  pixfmt: add planar RGB formats.

Conflicts:
	libavcodec/h264.c
	libavcodec/snow.c
	libavcodec/utils.c
	libavutil/avutil.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

2011-11-25 04:34:44 +01: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 remote-tracking branch 'qatar/master'

2011-10-23 05:13:56 +02:00

sparc

Replace FFmpeg with Libav in licence headers

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

x86

sws: update copyright dates

2011-11-18 21:44:26 +01: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

Compile x86/swscale_template with -mno-red-zone.

2011-09-25 16:59:52 +02:00

options.c

Merge remote-tracking branch 'qatar/master'

2011-10-13 06:00:03 +02:00

rgb2rgb_template.c

Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).

2011-11-09 01:58:22 +01:00

rgb2rgb.c

Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).

2011-11-09 01:58:22 +01:00

rgb2rgb.h

lsws: remove deprecated and unused stuff after the 0->1 major bump

2011-08-04 00:23:00 +02:00

swscale_internal.h

Merge remote-tracking branch 'qatar/master'

2011-11-25 04:34:44 +01:00

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2011-11-25 04:34:44 +01:00

swscale-test.c

sws: update copyright dates

2011-11-18 21:44:26 +01:00

swscale.c

Merge remote-tracking branch 'qatar/master'

2011-11-25 04:34:44 +01:00

swscale.h

sws: update copyright dates

2011-11-18 21:44:26 +01:00

utils.c

Merge remote-tracking branch 'qatar/master'

2011-11-25 04:34:44 +01:00

yuv2rgb.c

sws: Fix warning: ‘abase’ may be used uninitialized in this function

2011-11-18 21:51:29 +01:00