Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'

* commit '3bfdee00cd92ff07c364d4901c4aefda32780756': x86: dcadsp: Fix linking with yasm and optimizations disabled Conflicts: libavcodec/x86/dcadsp_init.c See: 206167a295 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 2d99de66b7
parent 7011aab501 3bfdee00cd
commit 2d99de66b7
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@ -83,7 +83,7 @@ SYNTH_FILTER_FUNC(sse)
 SYNTH_FILTER_FUNC(sse2)
 SYNTH_FILTER_FUNC(avx)
 SYNTH_FILTER_FUNC(fma3)
-#endif
+#endif /* HAVE_YASM */

 av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
 {
@ -104,5 +104,5 @@ av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
    if (EXTERNAL_FMA3(cpu_flags)) {
        s->synth_filter_float = synth_filter_fma3;
    }
-#endif
+#endif /* HAVE_YASM */
 }