[FFmpeg-cvslog] dsputil: add missing HAVE_YASM guard

Daniel Kang git at videolan.org
Sun Jan 27 16:34:44 CET 2013


ffmpeg | branch: master | Daniel Kang <daniel.d.kang at gmail.com> | Sun Jan 27 02:14:53 2013 -0500| [0eedf5d74dcef868668f73568760615c1b25cc60] | committer: Luca Barbato

dsputil: add missing HAVE_YASM guard

Fix compile error under
"--disable-optimizations --disable-yasm --disable-inline-asm"

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0eedf5d74dcef868668f73568760615c1b25cc60
---

 libavcodec/x86/dsputil_mmx.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 743a7c1..3ccef62 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -81,6 +81,7 @@ DECLARE_ALIGNED(16, const double, ff_pd_1)[2] = { 1.0, 1.0 };
 DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 };
 
 
+#if HAVE_YASM
 void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
                               int line_size, int h);
 void ff_put_pixels8_x2_3dnow(uint8_t *block, const uint8_t *pixels,
@@ -179,6 +180,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
                                                 int dstStride, int srcStride);
 #define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmxext
 #define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmxext
+#endif /* HAVE_YASM */
 
 
 #if HAVE_INLINE_ASM



More information about the ffmpeg-cvslog mailing list