Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 00:58:31 +0000 (02:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 00:58:59 +0000 (02:58 +0200)
* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/h264dsp_init.c

@@@ -210,10 -210,9 +210,10 @@@ H264_BIWEIGHT_10_SSE(4,  10
  av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
                                   const int chroma_format_idc)
  {
 +#if HAVE_YASM
      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) {