RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-03-06 14:09:48 +01:00
parent 7011aab501 3bfdee00cd
commit 2d99de66b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/dcadsp_init.c
View File

@ -83,7 +83,7 @@ SYNTH_FILTER_FUNC(sse)
SYNTH_FILTER_FUNC(sse2) SYNTH_FILTER_FUNC(sse2)
SYNTH_FILTER_FUNC(avx) SYNTH_FILTER_FUNC(avx)
SYNTH_FILTER_FUNC(fma3) SYNTH_FILTER_FUNC(fma3)
#endif #endif /* HAVE_YASM */
av_cold void ff_synth_filter_init_x86(SynthFilterContext *s) 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)) { if (EXTERNAL_FMA3(cpu_flags)) {
s->synth_filter_float = synth_filter_fma3; s->synth_filter_float = synth_filter_fma3;
} }
#endif #endif /* HAVE_YASM */
} }