aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-10 10:04:46 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-17 17:39:00 +0100
commited12d1ecadb63e3d4976b16ea9f6d7217800adf9 (patch)
treecd728354a54775efc19dbff52b80748e773d9806
parent05ed9b70059962251d16f0dd0c9da50a14a31ed4 (diff)
downloadffmpeg-ed12d1ecadb63e3d4976b16ea9f6d7217800adf9.tar.gz
Fix compilation with --disable-everything.
(cherry picked from commit f023003ce610a8fd6377cf4a8e98002ac3117ef4)
-rw-r--r--libavcodec/x86/dsputil_mmx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index f820d1f0d4..738bbd152b 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -1785,6 +1785,7 @@ static av_always_inline void gmc(uint8_t *dst, uint8_t *src,
}
}
+#if CONFIG_VIDEODSP
#if HAVE_YASM
#if ARCH_X86_32
static void gmc_mmx(uint8_t *dst, uint8_t *src,
@@ -1814,6 +1815,7 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src,
width, height, &ff_emulated_edge_mc_8);
}
#endif
+#endif
#endif /* HAVE_INLINE_ASM */
@@ -2518,7 +2520,7 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags)
c->scalarproduct_float = ff_scalarproduct_float_sse;
c->butterflies_float_interleave = ff_butterflies_float_interleave_sse;
-#if HAVE_INLINE_ASM
+#if HAVE_INLINE_ASM && CONFIG_VIDEODSP
c->gmc = gmc_sse;
#endif
#endif /* HAVE_YASM */