diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-03-26 04:41:25 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-04-04 19:08:05 +0200 |
| commit | 01c5779f56cf708e6cb88b11cfdc248cae7e2ee8 (patch) | |
| tree | 1424146b88fb5c2167edcc0a71c4ca3a903bc1a0 /libavcodec | |
| parent | b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7 (diff) | |
| download | ffmpeg-01c5779f56cf708e6cb88b11cfdc248cae7e2ee8.tar.gz | |
x86: Drop some unnecessary YASM ifdefs
Dead code elimination is enough to avoid undefined references in these cases.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/h264chroma_init.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/vorbisdsp_init.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 705a7d16e2..dc57c691a6 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -992,7 +992,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, int cpu_flags = av_get_cpu_flags(); const int dct_algo = avctx->dct_algo; -#if HAVE_YASM if (EXTERNAL_MMX(cpu_flags)) { if (!high_bit_depth) c->get_pixels = ff_get_pixels_mmx; @@ -1004,7 +1003,6 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, if (EXTERNAL_SSE2(cpu_flags)) if (!high_bit_depth) c->get_pixels = ff_get_pixels_sse2; -#endif /* HAVE_YASM */ #if HAVE_INLINE_ASM if (INLINE_MMX(cpu_flags)) { diff --git a/libavcodec/x86/h264chroma_init.c b/libavcodec/x86/h264chroma_init.c index eec1653d3f..8ec8a79aba 100644 --- a/libavcodec/x86/h264chroma_init.c +++ b/libavcodec/x86/h264chroma_init.c @@ -69,7 +69,6 @@ CHROMA_MC(avg, 8, 10, avx) av_cold void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) { -#if HAVE_YASM int high_bit_depth = bit_depth > 8; int cpu_flags = av_get_cpu_flags(); @@ -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->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx; } -#endif } diff --git a/libavcodec/x86/vorbisdsp_init.c b/libavcodec/x86/vorbisdsp_init.c index 2a978b66aa..bbd83195cc 100644 --- a/libavcodec/x86/vorbisdsp_init.c +++ b/libavcodec/x86/vorbisdsp_init.c @@ -31,7 +31,6 @@ void ff_vorbis_inverse_coupling_sse(float *mag, float *ang, av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) { -#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); #if ARCH_X86_32 @@ -40,5 +39,4 @@ av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) #endif /* ARCH_X86_32 */ if (EXTERNAL_SSE(cpu_flags)) dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_sse; -#endif /* HAVE_YASM */ } |