avcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and clang
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 27 Apr 2017 00:08:54 +0000 (02:08 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 27 Apr 2017 02:25:31 +0000 (04:25 +0200)
compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions
Build succeeds with this change, this was the only failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/x86/vc1dsp_init.c

index 79d22a2..0b00f8a 100644 (file)
@@ -106,10 +106,12 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
 {
     int cpu_flags = av_get_cpu_flags();
 
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (HAVE_6REGS && INLINE_MMX(cpu_flags) && EXTERNAL_MMX(cpu_flags))
+    if (HAVE_6REGS && INLINE_MMX(cpu_flags))
+        if (EXTERNAL_MMX(cpu_flags))
         ff_vc1dsp_init_mmx(dsp);
 
         ff_vc1dsp_init_mmx(dsp);
 
-    if (HAVE_6REGS && INLINE_MMXEXT(cpu_flags) && EXTERNAL_MMXEXT(cpu_flags))
+    if (HAVE_6REGS && INLINE_MMXEXT(cpu_flags))
+        if (EXTERNAL_MMXEXT(cpu_flags))
         ff_vc1dsp_init_mmxext(dsp);
 
 #define ASSIGN_LF(EXT) \
         ff_vc1dsp_init_mmxext(dsp);
 
 #define ASSIGN_LF(EXT) \