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-04-04 21:17:52 +02:00
2012-03-13 01:56:33 +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
2012-03-08 02:51:45 +01:00
2012-04-13 00:39:19 +02:00
2012-03-13 01:56:33 +01:00
2012-03-13 01:56:33 +01:00
2012-02-20 14:58:25 -08:00
2012-04-10 10:06:48 -07:00
2012-02-23 15:48:40 -08:00
2012-03-03 04:35:15 +01:00