Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-26 02:58:31 +02:00
commit 11ba0c8207
1 changed files with 1 additions and 1 deletions

View File

@ -213,7 +213,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
#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) {