[FFmpeg-cvslog] avcodec/x86/hevcdsp_init: fix build failure with --disable-mmx

Michael Niedermayer git at videolan.org
Fri May 9 05:21:08 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  9 05:16:27 2014 +0200| [341cacb9ac1bb041d49ddb31fd9671b094ca8a2d] | committer: Michael Niedermayer

avcodec/x86/hevcdsp_init: fix build failure with --disable-mmx

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/x86/hevcdsp_init.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c
index eaae58b..61ac6a9 100644
--- a/libavcodec/x86/hevcdsp_init.c
+++ b/libavcodec/x86/hevcdsp_init.c
@@ -28,7 +28,6 @@
 #include "libavcodec/hevcdsp.h"
 #include "libavcodec/x86/hevcdsp.h"
 
-#if ARCH_X86_64
 
 #define mc_rep_func(name, bitd, step, W, opt) \
 void ff_hevc_put_hevc_##name##W##_##bitd##_##opt(int16_t *_dst, ptrdiff_t dststride,                            \
@@ -83,6 +82,8 @@ void ff_hevc_put_hevc_bi_##name##W##_##bitd##_##opt(uint8_t *_dst, ptrdiff_t dst
     mc_rep_bi_func(name, bitd, step, W, opt)
 
 
+#if ARCH_X86_64 && HAVE_SSE4_EXTERNAL
+
 mc_rep_funcs(pel_pixels, 8, 16, 64, sse4);
 mc_rep_funcs(pel_pixels, 8, 16, 48, sse4);
 mc_rep_funcs(pel_pixels, 8, 16, 32, sse4);
@@ -317,7 +318,7 @@ mc_bi_w_funcs(qpel_h, 10, sse4);
 mc_bi_w_funcs(qpel_v, 10, sse4);
 mc_bi_w_funcs(qpel_hv, 10, sse4);
 
-#endif //ARCH_X86_64
+#endif //ARCH_X86_64 && HAVE_SSE4_EXTERNAL
 
 
 #define EPEL_LINKS(pointer, my, mx, fname, bitd, opt )           \



More information about the ffmpeg-cvslog mailing list