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-11 01:22:22 +01:00
2012-03-29 04:11:10 +02:00
2012-03-15 22:12:02 +01:00
2012-04-13 00:39:19 +02:00
2012-04-05 22:26:50 +02:00
2012-02-16 01:34:37 +01:00
2012-04-13 00:39:19 +02:00
2012-03-17 20:48:56 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-04-13 00:39:19 +02:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-01 02:36:09 +01:00
2012-04-13 00:39:19 +02:00
2012-04-13 00:39:19 +02:00
2012-02-28 03:38:58 +01:00
2012-04-13 00:39:19 +02:00
2012-03-29 04:11:10 +02:00
2012-04-13 00:39:19 +02:00
2012-04-13 00:39:19 +02:00
2012-02-12 18:56:06 +01:00
2012-04-13 00:39:19 +02:00
2012-04-11 15:47:00 -04:00
2012-03-08 02:51:45 +01:00
2012-04-13 00:39:19 +02:00
2012-02-12 18:56:06 +01:00
2012-02-10 01:20:07 +01:00
2012-02-09 12:26:45 +01:00
2012-02-12 21:42:31 +01:00
2012-04-13 00:39:19 +02:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-10 23:18:52 +01:00
2012-02-12 21:42:31 +01:00
2012-02-20 14:58:25 -08:00
2012-04-10 10:06:48 -07:00
2012-04-10 22:53:25 +02:00
2012-02-23 15:50:09 -08:00
2012-04-04 11:24:27 -07:00
2012-02-22 02:24:18 +01:00
2012-02-12 21:42:31 +01:00
2012-03-24 14:54:06 +01:00
2012-03-05 00:15:55 +01:00
2012-04-05 22:26:50 +02:00
2012-02-02 12:00:48 -08:00