diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 02:58:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 02:58:59 +0200 |
| commit | 11ba0c82076dd4b22b5d28ff8004308f6ee99b4e (patch) | |
| tree | 476c126544246e641707018adc0b12aecc042bef /libavcodec | |
| parent | 3eae34d50fc52ff7b8367f9ade1cd189bfc1a221 (diff) | |
| parent | 5ab03e41e553452118113d0c224fa32b325e45e5 (diff) | |
Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'
* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
x86: h264dsp: Fix link failure with optimizations disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/h264dsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 311df5f856..35db20014a 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -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) { |