From aa945dc112b098f3b8139b1d97475839ea88410e Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 2 Feb 2015 00:00:53 -0300 Subject: [PATCH] x86/hevcdsp: add missing vzeroupper in ff_hevc_sao_band_filter_48_*_avx2 Signed-off-by: James Almer --- libavcodec/x86/hevc_sao.asm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/x86/hevc_sao.asm b/libavcodec/x86/hevc_sao.asm index 05855290f5..b389a9f68d 100644 --- a/libavcodec/x86/hevc_sao.asm +++ b/libavcodec/x86/hevc_sao.asm @@ -124,7 +124,9 @@ INIT_XMM cpuname HEVC_SAO_BAND_FILTER_COMPUTE 8, m9, m13 packuswb m8, m13 mova [dstq + i], m8 -%assign i i+16 +%if cpuflag(avx2) +INIT_YMM cpuname +%endif %endif ; %1 == 48 add dstq, dststrideq ; dst += dststride @@ -174,7 +176,9 @@ INIT_XMM cpuname HEVC_SAO_BAND_FILTER_COMPUTE %1, m8, m9 CLIPW m9, m14, m13 mova [dstq + i + mmsize], m9 -%assign i i+32 +%if cpuflag(avx2) +INIT_YMM cpuname +%endif %endif ; %1 == 48 add dstq, dststrideq @@ -216,7 +220,6 @@ HEVC_SAO_BAND_FILTER_8 16, 1 INIT_YMM avx2 HEVC_SAO_BAND_FILTER_8 32, 1 HEVC_SAO_BAND_FILTER_8 48, 1 -INIT_YMM avx2 HEVC_SAO_BAND_FILTER_8 64, 2 INIT_XMM avx2 @@ -225,7 +228,6 @@ HEVC_SAO_BAND_FILTER_16 10, 16, 1 INIT_YMM avx2 HEVC_SAO_BAND_FILTER_16 10, 32, 1 HEVC_SAO_BAND_FILTER_16 10, 48, 1 -INIT_YMM avx2 HEVC_SAO_BAND_FILTER_16 10, 64, 2 INIT_XMM avx2 @@ -234,7 +236,6 @@ HEVC_SAO_BAND_FILTER_16 12, 16, 1 INIT_YMM avx2 HEVC_SAO_BAND_FILTER_16 12, 32, 1 HEVC_SAO_BAND_FILTER_16 12, 48, 1 -INIT_YMM avx2 HEVC_SAO_BAND_FILTER_16 12, 64, 2 %endif %endif