1. 14 Apr, 2012 11 commits
  2. 13 Apr, 2012 28 commits
  3. 12 Apr, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · ca19862d
      Michael Niedermayer authored
      * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
      ca19862d