[FFmpeg-cvslog] x86/vp9dsp: add missing preprocessor guards

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Sep 19 13:33:53 2015 -0300| [6f9ba0cb82a6515c4571312c05934bdc7bb11a58] | committer: James Almer

x86/vp9dsp: add missing preprocessor guards

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/x86/vp9dsp_init_16bpp_template.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/x86/vp9dsp_init_16bpp_template.c b/libavcodec/x86/vp9dsp_init_16bpp_template.c
index a1ce212..f48225c 100644
--- a/libavcodec/x86/vp9dsp_init_16bpp_template.c
+++ b/libavcodec/x86/vp9dsp_init_16bpp_template.c
@@ -38,26 +38,32 @@ decl_mc_funcs(16, avx2, int16_t, 16, BPC);
 mc_rep_funcs(16,  8, 16, sse2, int16_t, 16, BPC);
 mc_rep_funcs(32, 16, 32, sse2, int16_t, 16, BPC);
 mc_rep_funcs(64, 32, 64, sse2, int16_t, 16, BPC);
+#if HAVE_AVX2_EXTERNAL
 mc_rep_funcs(32, 16, 32, avx2, int16_t, 16, BPC);
 mc_rep_funcs(64, 32, 64, avx2, int16_t, 16, BPC);
+#endif
 
 filters_8tap_2d_fn2(put, 16, BPC, 2, sse2, sse2, 16bpp)
 filters_8tap_2d_fn2(avg, 16, BPC, 2, sse2, sse2, 16bpp)
+#if HAVE_AVX2_EXTERNAL
 filters_8tap_2d_fn(put, 64, 32, BPC, 2, avx2, 16bpp)
 filters_8tap_2d_fn(avg, 64, 32, BPC, 2, avx2, 16bpp)
 filters_8tap_2d_fn(put, 32, 32, BPC, 2, avx2, 16bpp)
 filters_8tap_2d_fn(avg, 32, 32, BPC, 2, avx2, 16bpp)
 filters_8tap_2d_fn(put, 16, 32, BPC, 2, avx2, 16bpp)
 filters_8tap_2d_fn(avg, 16, 32, BPC, 2, avx2, 16bpp)
+#endif
 
 filters_8tap_1d_fn3(put, BPC, sse2, sse2, 16bpp)
 filters_8tap_1d_fn3(avg, BPC, sse2, sse2, 16bpp)
+#if HAVE_AVX2_EXTERNAL
 filters_8tap_1d_fn2(put, 64, BPC, avx2, 16bpp)
 filters_8tap_1d_fn2(avg, 64, BPC, avx2, 16bpp)
 filters_8tap_1d_fn2(put, 32, BPC, avx2, 16bpp)
 filters_8tap_1d_fn2(avg, 32, BPC, avx2, 16bpp)
 filters_8tap_1d_fn2(put, 16, BPC, avx2, 16bpp)
 filters_8tap_1d_fn2(avg, 16, BPC, avx2, 16bpp)
+#endif
 
 #endif /* HAVE_YASM */
 
@@ -72,10 +78,12 @@ av_cold void INIT_FUNC(VP9DSPContext *dsp)
     }
 
     if (EXTERNAL_AVX2(cpu_flags)) {
+#if HAVE_AVX2_EXTERNAL
         init_subpel3_32_64(0,  put, BPC, avx2);
         init_subpel3_32_64(1,  avg, BPC, avx2);
         init_subpel2(2, 0, 16, put, BPC, avx2);
         init_subpel2(2, 1, 16, avg, BPC, avx2);
+#endif
     }
 
 #endif /* HAVE_YASM */