ffmpeg/libavutil/x86
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
..
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
cpu.c Detect and check for CMOV. 2012-02-12 18:56:06 +01:00
intmath.h
intreadwrite.h
timer.h
w64xmmtest.h win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00
x86inc.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00