[SCM] libav/experimental: x86: h264dsp: Fix link failure with optimizations disabled

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5ab03e41e553452118113d0c224fa32b325e45e5
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jun 25 04:35:30 2014 -0700

    x86: h264dsp: Fix link failure with optimizations disabled
    
    With optimzations disabled compilers have trouble doing dead code
    elimination on 'if (foo && 0)' expressions, while 'if (0 && foo)'
    still works, so use the latter to avoid problems.
    
    Bug-Id: 707

diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
index 427662f..134d594 100644
--- a/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@ -212,7 +212,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (chroma_format_idc <= 1 && EXTERNAL_MMXEXT(cpu_flags))
+    if (EXTERNAL_MMXEXT(cpu_flags) && chroma_format_idc <= 1)
         c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmxext;
 
     if (bit_depth == 8) {

-- 
Libav/FFmpeg packaging