diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-06-25 04:35:30 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-25 15:24:51 -0700 |
| commit | 5ab03e41e553452118113d0c224fa32b325e45e5 (patch) | |
| tree | 4f6b8e1834aff03154a8eee8f274559b5cd79089 | |
| parent | 2deb614272e6faad8802c5341971d08c7272f74d (diff) | |
| download | ffmpeg-5ab03e41e553452118113d0c224fa32b325e45e5.tar.gz | |
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
| -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 427662f627..134d594ca9 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) { |