From 35b00bd2d7c78908a160f9a003e55c069a42eb49 Mon Sep 17 00:00:00 2001
From: Albert Lee <trisk+xine@acm.jhu.edu>
Date: Thu, 14 Jun 2007 16:35:58 +0200
Subject: Init dsputil only once (fixes when MMX and mediaLib are both
 present). Applied to FFmpeg tree already.

---
 src/libffmpeg/libavcodec/dsputil.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'src/libffmpeg')

diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c
index 916d8658c..b4aa09188 100644
--- a/src/libffmpeg/libavcodec/dsputil.c
+++ b/src/libffmpeg/libavcodec/dsputil.c
@@ -4121,31 +4121,23 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab));
     memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab));
 
-#ifdef HAVE_MMX
+#if defined(HAVE_MMX)
     dsputil_init_mmx(c, avctx);
-#endif
-#ifdef ARCH_ARMV4L
+#elif defined(ARCH_ARMV4L)
     dsputil_init_armv4l(c, avctx);
-#endif
-#ifdef HAVE_MLIB
+#elif defined(HAVE_MLIB)
     dsputil_init_mlib(c, avctx);
-#endif
-#ifdef ARCH_SPARC
+#elif defined(ARCH_SPARC)
    dsputil_init_vis(c,avctx);
-#endif
-#ifdef ARCH_ALPHA
+#elif defined(ARCH_ALPHA)
     dsputil_init_alpha(c, avctx);
-#endif
-#ifdef ARCH_POWERPC
+#elif defined(ARCH_POWERPC)
     dsputil_init_ppc(c, avctx);
-#endif
-#ifdef HAVE_MMI
+#elif defined(HAVE_MMI)
     dsputil_init_mmi(c, avctx);
-#endif
-#ifdef ARCH_SH4
+#elif defined(ARCH_SH4)
     dsputil_init_sh4(c,avctx);
-#endif
-#ifdef ARCH_BFIN
+#elif defined(ARCH_BFIN)
     dsputil_init_bfin(c,avctx);
 #endif
 
-- 
cgit v1.2.3