diff options
| author | Michael Niedermayer <[email protected]> | 2017-04-27 02:08:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2017-05-16 16:00:22 +0200 |
| commit | 52d07518a32dbc015882ab73bc5f70f4079f83ff (patch) | |
| tree | 1fc06f25d45c1b0cd22049ccea272d0365f78d5c | |
| parent | b391e4c8f4fe08a1fbeb04df794230c0dfb0fd6e (diff) | |
avcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and clang
compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions
Build succeeds with this change, this was the only failure
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit fa8fd0808f1086fc85abba5cf123faf41da49305)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index c8943fa2f7..c53a1328f2 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -106,10 +106,12 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (HAVE_6REGS && INLINE_MMX(cpu_flags) && EXTERNAL_MMX(cpu_flags)) + if (HAVE_6REGS && INLINE_MMX(cpu_flags)) + if (EXTERNAL_MMX(cpu_flags)) ff_vc1dsp_init_mmx(dsp); - if (HAVE_6REGS && INLINE_MMXEXT(cpu_flags) && EXTERNAL_MMXEXT(cpu_flags)) + if (HAVE_6REGS && INLINE_MMXEXT(cpu_flags)) + if (EXTERNAL_MMXEXT(cpu_flags)) ff_vc1dsp_init_mmxext(dsp); #define ASSIGN_LF(EXT) \ |