diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 02:39:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 02:39:19 +0400 |
commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
tree | dc114d719849d6c3645063e02378dfddecbc991a /libavcodec/mips | |
parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) |
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>
Diffstat (limited to 'libavcodec/mips')
-rw-r--r-- | libavcodec/mips/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile index 006617687e..37899b1f7a 100644 --- a/libavcodec/mips/Makefile +++ b/libavcodec/mips/Makefile @@ -1,3 +1,3 @@ -OBJS-$(HAVE_MMI) += mips/dsputil_mmi.o \ - mips/idct_mmi.o \ - mips/mpegvideo_mmi.o \ +MMI-OBJS += mips/dsputil_mmi.o \ + mips/idct_mmi.o \ + mips/mpegvideo_mmi.o \ |