[FFmpeg-cvslog] avcodec/x86/dct_init: fix build failure with clang && disable-optimizations

Michael Niedermayer git at videolan.org
Mon Jun 9 19:37:35 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  9 19:32:41 2014 +0200| [06f576c4ab3bf21d26c7ea496e836a5fe7a10f87] | committer: Michael Niedermayer

avcodec/x86/dct_init: fix build failure with clang && disable-optimizations

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

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

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

diff --git a/libavcodec/x86/dct_init.c b/libavcodec/x86/dct_init.c
index fd6ef45..30c8f12 100644
--- a/libavcodec/x86/dct_init.c
+++ b/libavcodec/x86/dct_init.c
@@ -30,7 +30,7 @@ av_cold void ff_dct_init_x86(DCTContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (EXTERNAL_SSE(cpu_flags) && ARCH_X86_32)
+    if (ARCH_X86_32 && EXTERNAL_SSE(cpu_flags))
         s->dct32 = ff_dct32_float_sse;
     if (EXTERNAL_SSE2(cpu_flags))
         s->dct32 = ff_dct32_float_sse2;



More information about the ffmpeg-cvslog mailing list