[FFmpeg-cvslog] avcodec/x86/lpc: Fix cpu flag checks so they work

Michael Niedermayer git at videolan.org
Fri Aug 30 12:48:17 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 30 12:32:54 2013 +0200| [7fb758cd8ed08e4a37f10e25003953d13c68b8cd] | committer: Michael Niedermayer

avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

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

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

 libavcodec/x86/lpc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c
index f4dd189..8a74755 100644
--- a/libavcodec/x86/lpc.c
+++ b/libavcodec/x86/lpc.c
@@ -151,7 +151,7 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
 #if HAVE_SSE2_INLINE
     int cpu_flags = av_get_cpu_flags();
 
-    if (INLINE_SSE2(cpu_flags) && (cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
+    if (HAVE_SSE2_INLINE && cpu_flags & (AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_SSE2SLOW)) {
         c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
         c->lpc_compute_autocorr   = lpc_compute_autocorr_sse2;
     }



More information about the ffmpeg-cvslog mailing list