[FFmpeg-cvslog] Fix compilation with --disable-everything.
Carl Eugen Hoyos
git at videolan.org
Thu Jan 10 10:05:45 CET 2013
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jan 10 10:04:46 2013 +0100| [f023003ce610a8fd6377cf4a8e98002ac3117ef4] | committer: Carl Eugen Hoyos
Fix compilation with --disable-everything.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f023003ce610a8fd6377cf4a8e98002ac3117ef4
---
libavcodec/x86/dsputil_mmx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index f820d1f..738bbd1 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 */
More information about the ffmpeg-cvslog
mailing list