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
..
2012-02-06 20:33:06 +01:00
2012-04-04 20:39:33 +02:00
2012-04-01 10:33:16 +02:00
2011-12-19 11:57:34 +01:00
2012-04-04 20:39:33 +02:00
2012-04-04 20:39:33 +02:00
2012-03-03 04:30:49 +01:00
2011-12-30 20:00:53 +01:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-04-12 20:29:56 +02:00
2012-03-31 12:37:42 +02:00
2012-03-23 01:27:49 +01:00
2012-03-10 18:01:03 +01:00
2012-04-06 00:53:09 +02:00
2011-12-20 22:38:53 +01:00
2012-03-27 12:52:53 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02:00
2012-02-28 07:20:36 +01:00
2012-04-06 08:32:09 +02:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00
2012-03-23 10:31:45 +01:00