diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:16:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:16:39 +0200 |
| commit | ebb21887b853ffd2ae6eedddef39e13c91bc7956 (patch) | |
| tree | 95a94b931393cb99f27ecffddf14cd1012b0926f /libavresample | |
| parent | 865c94bb57dbb44b0855bba66cd4a11b28cc6ba2 (diff) | |
| parent | 01c5779f56cf708e6cb88b11cfdc248cae7e2ee8 (diff) | |
| download | ffmpeg-ebb21887b853ffd2ae6eedddef39e13c91bc7956.tar.gz | |
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/x86/audio_mix_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavresample/x86/audio_mix_init.c b/libavresample/x86/audio_mix_init.c index bec88b0d3a..2f05eee81a 100644 --- a/libavresample/x86/audio_mix_init.c +++ b/libavresample/x86/audio_mix_init.c @@ -173,7 +173,6 @@ DEFINE_MIX_3_8_TO_1_2(8) av_cold void ff_audio_mix_init_x86(AudioMix *am) { -#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_SSE(cpu_flags)) { @@ -211,5 +210,4 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am) SET_MIX_3_8_TO_1_2(6) SET_MIX_3_8_TO_1_2(7) SET_MIX_3_8_TO_1_2(8) -#endif /* HAVE_YASM */ } |