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

* qatar/master:
  swscale: Fix stack alignment for SSE
  avcodec: move some AVCodecContext fields to an internal struct.
  avcodec: use av_opt_set() instead of deprecated av_set_string3()
  avcodec: fix some const warnings
  avcodec: remove pointless AVOption, internal_buffer_count
  imgutils: Fix illegal read.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

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

2011-11-20 02:46:06 +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

…

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

sws: update copyright dates

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

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2011-11-20 02:46:06 +01:00

swscale-test.c

sws: update copyright dates

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

swscale.c

sws: update copyright dates

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

swscale.h

sws: update copyright dates

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

utils.c

sws: Fix:

2011-11-18 22:00:27 +01:00

yuv2rgb.c

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

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