From: James Almer Date: Fri, 5 Sep 2014 02:33:14 +0000 (-0300) Subject: x86/hevc_res_add: add missing guards to hevc_transform_add32_8_avx2 X-Git-Tag: android-x86-6.0-r1~3245 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52ec81c67d112ca8f1a0ae779a4b6e0f27f47ba3;p=android-x86%2Fexternal-ffmpeg.git x86/hevc_res_add: add missing guards to hevc_transform_add32_8_avx2 Should fix compilation with old Yasm/Nasm versions. Signed-off-by: James Almer --- diff --git a/libavcodec/x86/hevc_res_add.asm b/libavcodec/x86/hevc_res_add.asm index 488c5b7190..24b88eebab 100644 --- a/libavcodec/x86/hevc_res_add.asm +++ b/libavcodec/x86/hevc_res_add.asm @@ -177,6 +177,7 @@ TRANSFORM_ADD_8 INIT_XMM avx TRANSFORM_ADD_8 +%if HAVE_AVX2_EXTERNAL INIT_YMM avx2 ; void ff_hevc_transform_add32_8_avx2(uint8_t *dst, int16_t *coeffs, ptrdiff_t stride) cglobal hevc_transform_add32_8, 3, 4, 7 @@ -191,6 +192,7 @@ cglobal hevc_transform_add32_8, 3, 4, 7 TR_ADD_SSE_16_32_8 128, r0+r2*2, r0+r3 %endrep RET +%endif ;----------------------------------------------------------------------------- ; void ff_hevc_transform_add_10(pixel *dst, int16_t *block, int stride)