summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-02 11:58:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-02 12:02:08 +0200
commita478e99a603f2abf3b65bc96176af7b278555035 (patch)
tree9ea526b6444059604c4a12fdbd5299e1178963e4
parent951a3655048095afbddf5e9f78ac8498636e2479 (diff)
avutil/x86: reenable ff_update_lls_avx()
The bug has been fixed in c8b920a9b7fa534a6141695ace4e8c2dfcd56cee by Loren Merritt Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/x86/lls.asm2
-rw-r--r--libavutil/x86/lls_init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
index 481044ff0d..769befb769 100644
--- a/libavutil/x86/lls.asm
+++ b/libavutil/x86/lls.asm
@@ -125,7 +125,7 @@ cglobal update_lls, 2,5,8, ctx, var, i, j, covar2
.ret:
REP_RET
-%if HAVE_AVX_EXTERNAL && 0
+%if HAVE_AVX_EXTERNAL
INIT_YMM avx
cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2
%define covarq ctxq
diff --git a/libavutil/x86/lls_init.c b/libavutil/x86/lls_init.c
index eb570428e7..181ca38dae 100644
--- a/libavutil/x86/lls_init.c
+++ b/libavutil/x86/lls_init.c
@@ -35,7 +35,7 @@ av_cold void ff_init_lls_x86(LLSModel *m)
if (m->indep_count >= 4)
m->evaluate_lls = ff_evaluate_lls_sse2;
}
- if (EXTERNAL_AVX(cpu_flags) && 0) {
+ if (EXTERNAL_AVX(cpu_flags)) {
m->update_lls = ff_update_lls_avx;
}
}