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

..

dsputil_vis.c

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

dsputil_vis.h

…

Makefile

build: Consistently handle conditional compilation for all optimization OBJS.

2012-04-12 09:00:49 +02:00

simple_idct_vis.c

…

vis.h

…