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-02 18:50:42 +00:00
2011-10-22 11:11:08 +02:00
2011-10-24 01:01:21 +02:00
2012-01-14 02:22:09 +01:00
2011-12-15 01:02:58 +00:00
2012-04-04 21:17:52 +02:00
2012-03-13 01:56:33 +01:00
2011-11-24 03:32:24 +01:00
2012-03-13 01:56:33 +01:00
2012-04-04 21:17:52 +02:00
2012-04-04 21:17:52 +02:00
2012-03-08 02:51:45 +01:00
2011-12-02 00:51:11 +01:00
2012-01-21 01:33:31 +01:00
2011-11-24 03:32:24 +01:00
2011-11-24 03:32:24 +01:00
2011-12-06 13:48:25 +00:00
2011-10-22 01:16:41 +02:00
2011-12-07 02:04:00 +01:00
2011-11-24 03:32:24 +01:00
2011-10-21 01:00:41 -07:00
2012-03-08 02:51:45 +01:00
2012-04-13 00:39:19 +02:00
2011-11-24 03:32:24 +01:00
2012-03-13 01:56:33 +01:00
2012-03-13 01:56:33 +01:00
2012-02-16 01:34:37 +01:00
2011-12-02 19:59:18 +00:00
2012-02-20 14:58:25 -08:00
2012-01-16 19:26:41 +01:00
2012-04-10 10:06:48 -07:00
2011-12-16 14:36:01 +00:00
2012-02-23 15:48:40 -08:00
2012-01-28 14:56:18 +00:00
2012-01-14 02:22:09 +01:00
2012-02-07 01:40:29 +01:00
2012-02-10 01:20:07 +01:00
2011-10-03 01:49:36 +02:00
2012-03-03 04:35:15 +01:00
2012-02-07 01:40:29 +01:00