[SCM] libav/experimental: simplify i386 object handling

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:41 UTC 2013


The following commit has been merged in the experimental branch:
commit 3dc09ed18883315fc50b2c91897f7d6ad087bcfd
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Feb 21 23:32:13 2007 +0000

    simplify i386 object handling
    
    Originally committed as revision 8056 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4784fcb..5b1bda9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -329,12 +329,8 @@ OBJS += i386/fdct_mmx.o \
         i386/fft_3dn2.o \
         i386/snowdsp_mmx.o \
 
-ifeq ($(CONFIG_GPL),yes)
-OBJS += i386/idct_mmx.o
-endif
-ifeq ($(CONFIG_CAVS_DECODER),yes)
-OBJS += i386/cavsdsp_mmx.o
-endif
+OBJS-$(CONFIG_GPL)                     += i386/idct_mmx.o
+OBJS-$(CONFIG_CAVS_DECODER)            += i386/cavsdsp_mmx.o
 endif
 
 # armv4l specific stuff

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list