diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 14:09:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 14:10:27 +0100 |
| commit | 2d99de66b7f1f805ae75d7502508ede18b52e95a (patch) | |
| tree | 0b51c8eec70bdf09661e8c1f67b7074eece69aad /libavcodec | |
| parent | 7011aab5018a71d84ff00b375b94a5bb71b44937 (diff) | |
| parent | 3bfdee00cd92ff07c364d4901c4aefda32780756 (diff) | |
| download | ffmpeg-streaming-2d99de66b7f1f805ae75d7502508ede18b52e95a.zip ffmpeg-streaming-2d99de66b7f1f805ae75d7502508ede18b52e95a.tar.gz | |
Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
x86: dcadsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/dcadsp_init.c
See: 206167a295a5c28cec3c38f7308835b0b7e0618f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dcadsp_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c index 19559f3..48880d6 100644 --- 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 */ } |
