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

* qatar/master:
  libxvid: remove disabled code
  qdm2: make a table static const
  qdm2: simplify bitstream reader setup for some subpacket types
  qdm2: use get_bits_left()
  build: Consistently handle conditional compilation for all optimization OBJS.
  avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
  msrle: convert MS RLE decoding function to bytestream2.
  x86inc improvements for 64-bit

Conflicts:
	common.mak
	libavcodec/avpacket.c
	libavcodec/bfi.c
	libavcodec/msrledec.c
	libavcodec/qdm2.c

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

2012-04-13 00:39:19 +02:00

..

bfin

Merge remote-tracking branch 'qatar/master'

2012-02-03 03:51:32 +01:00

ppc

ppc: Add/remove a number of const qualifiers to fix related warnings.

2012-04-09 20:39:33 +02:00

sparc

Merge remote-tracking branch 'qatar/master'

2012-02-08 05:53:35 +01:00

x86

Merge remote-tracking branch 'qatar/master'

2012-04-13 00:39:19 +02:00

colorspace-test.c

swscale-test: Drop unused argc and argv arguments from main().

2012-02-01 14:24:25 +01:00

input.c

Merge remote-tracking branch 'qatar/master'

2012-04-05 22:26:50 +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'

2012-04-13 00:39:19 +02:00

options.c

Merge remote-tracking branch 'qatar/master'

2012-03-05 00:15:55 +01:00

output.c

Merge remote-tracking branch 'qatar/master'

2012-04-05 22:26:50 +02:00

rgb2rgb_template.c

Merge remote-tracking branch 'qatar/master'

2012-02-23 04:31:55 +01:00

rgb2rgb.c

Merge remote-tracking branch 'qatar/master'

2012-02-23 04:31:55 +01:00

rgb2rgb.h

Merge remote-tracking branch 'qatar/master'

2012-01-14 02:22:09 +01:00

swscale_internal.h

Merge remote-tracking branch 'qatar/master'

2012-04-04 01:14:45 +02:00

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2012-04-04 01:14:45 +02:00

swscale-test.c

Merge remote-tracking branch 'qatar/master'

2012-01-14 02:22:09 +01:00

swscale.c

Merge remote-tracking branch 'qatar/master'

2012-03-07 03:22:49 +01:00

swscale.h

Merge remote-tracking branch 'qatar/master'

2012-01-10 03:50:41 +01:00

utils.c

swscale: Merge a hunk from qatar that seems to have been forgotten or lost.

2012-03-21 15:30:52 +01:00

yuv2rgb.c

Merge remote-tracking branch 'qatar/master'

2012-02-23 04:31:55 +01:00