Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Apr 2012 22:39:19 +0000 (00:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Apr 2012 22:39:19 +0000 (00:39 +0200)
commitca19862d3879dfadfd6c1a1a443eac40fc433385
treedc114d719849d6c3645063e02378dfddecbc991a
parent5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4
parent18e8fef7c9292041e3266487d9bc6b59e5eaa798
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>
30 files changed:
Makefile
common.mak
libavcodec/aasc.c
libavcodec/arm/Makefile
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/bgmc.c
libavcodec/bmp.c
libavcodec/libxvid_rc.c
libavcodec/msrle.c
libavcodec/msrledec.c
libavcodec/msrledec.h
libavcodec/qdm2.c
libavcodec/tscc.c
libavcodec/x86/Makefile
libavcodec/x86/diracdsp_yasm.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavformat/rawenc.c
libavutil/x86/x86inc.asm
libswscale/Makefile
libswscale/x86/output.asm
libswscale/x86/scale.asm