diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 11:59:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 12:12:11 +0200 |
| commit | a285079bc75a6e3b9aa27910351044b79bc0c490 (patch) | |
| tree | 37c85c48b261c51229d7ed51cf23e7f854451c01 /libavutil | |
| parent | 0b40c505087ff238becd297c890fb12fbc0d99a5 (diff) | |
| download | ffmpeg-a285079bc75a6e3b9aa27910351044b79bc0c490.tar.gz | |
lls.asm: disable ff_update_lls_avx
The code doesnt build with yasm from ubuntu 12.04
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/lls.asm | 2 | ||||
| -rw-r--r-- | 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 fac56b295a..59398b4867 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 6437be958c..0c7b75d07c 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; } } |