Commit 01c5779f authored by Diego Biurrun's avatar Diego Biurrun

x86: Drop some unnecessary YASM ifdefs

Dead code elimination is enough to avoid undefined references in these cases.
parent b718b24b
...@@ -992,7 +992,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, ...@@ -992,7 +992,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
const int dct_algo = avctx->dct_algo; const int dct_algo = avctx->dct_algo;
#if HAVE_YASM
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
if (!high_bit_depth) if (!high_bit_depth)
c->get_pixels = ff_get_pixels_mmx; c->get_pixels = ff_get_pixels_mmx;
...@@ -1004,7 +1003,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, ...@@ -1004,7 +1003,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
if (EXTERNAL_SSE2(cpu_flags)) if (EXTERNAL_SSE2(cpu_flags))
if (!high_bit_depth) if (!high_bit_depth)
c->get_pixels = ff_get_pixels_sse2; c->get_pixels = ff_get_pixels_sse2;
#endif /* HAVE_YASM */
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
if (INLINE_MMX(cpu_flags)) { if (INLINE_MMX(cpu_flags)) {
......
...@@ -69,7 +69,6 @@ CHROMA_MC(avg, 8, 10, avx) ...@@ -69,7 +69,6 @@ CHROMA_MC(avg, 8, 10, avx)
av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
{ {
#if HAVE_YASM
int high_bit_depth = bit_depth > 8; int high_bit_depth = bit_depth > 8;
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
...@@ -115,5 +114,4 @@ av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) ...@@ -115,5 +114,4 @@ av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx; c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx;
c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx; c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx;
} }
#endif
} }
...@@ -31,7 +31,6 @@ void ff_vorbis_inverse_coupling_sse(float *mag, float *ang, ...@@ -31,7 +31,6 @@ void ff_vorbis_inverse_coupling_sse(float *mag, float *ang,
av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
{ {
#if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32 #if ARCH_X86_32
...@@ -40,5 +39,4 @@ av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) ...@@ -40,5 +39,4 @@ av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
#endif /* ARCH_X86_32 */ #endif /* ARCH_X86_32 */
if (EXTERNAL_SSE(cpu_flags)) if (EXTERNAL_SSE(cpu_flags))
dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_sse; dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_sse;
#endif /* HAVE_YASM */
} }
...@@ -38,7 +38,6 @@ void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur, ...@@ -38,7 +38,6 @@ void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur,
av_cold void ff_yadif_init_x86(YADIFContext *yadif) av_cold void ff_yadif_init_x86(YADIFContext *yadif)
{ {
#if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32 #if ARCH_X86_32
...@@ -49,5 +48,4 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) ...@@ -49,5 +48,4 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif)
yadif->filter_line = ff_yadif_filter_line_sse2; yadif->filter_line = ff_yadif_filter_line_sse2;
if (EXTERNAL_SSSE3(cpu_flags)) if (EXTERNAL_SSSE3(cpu_flags))
yadif->filter_line = ff_yadif_filter_line_ssse3; yadif->filter_line = ff_yadif_filter_line_ssse3;
#endif /* HAVE_YASM */
} }
...@@ -173,7 +173,6 @@ DEFINE_MIX_3_8_TO_1_2(8) ...@@ -173,7 +173,6 @@ DEFINE_MIX_3_8_TO_1_2(8)
av_cold void ff_audio_mix_init_x86(AudioMix *am) av_cold void ff_audio_mix_init_x86(AudioMix *am)
{ {
#if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE(cpu_flags)) { if (EXTERNAL_SSE(cpu_flags)) {
...@@ -211,5 +210,4 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am) ...@@ -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(6)
SET_MIX_3_8_TO_1_2(7) SET_MIX_3_8_TO_1_2(7)
SET_MIX_3_8_TO_1_2(8) SET_MIX_3_8_TO_1_2(8)
#endif /* HAVE_YASM */
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment