[FFmpeg-cvslog] lls.asm: disable ff_update_lls_avx

Michael Niedermayer git at videolan.org
Sun Jun 30 12:14:07 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 11:59:31 2013 +0200| [a285079bc75a6e3b9aa27910351044b79bc0c490] | committer: Michael Niedermayer

lls.asm: disable ff_update_lls_avx

The code doesnt build with yasm from ubuntu 12.04

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

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

 libavutil/x86/lls.asm    |    2 +-
 libavutil/x86/lls_init.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
index fac56b2..59398b4 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
+%if HAVE_AVX_EXTERNAL && 0
 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 6437be9..0c7b75d 100644
--- a/libavutil/x86/lls_init.c
+++ b/libavutil/x86/lls_init.c
@@ -32,7 +32,7 @@ av_cold void ff_init_lls_x86(LLSModel *m)
     if (EXTERNAL_SSE2(cpu_flags)) {
         m->update_lls = ff_update_lls_sse2;
     }
-    if (EXTERNAL_AVX(cpu_flags)) {
+    if (EXTERNAL_AVX(cpu_flags) && 0) {
         m->update_lls = ff_update_lls_avx;
     }
 }



More information about the ffmpeg-cvslog mailing list