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 /libavcodec | |
| 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 '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 d61de6bcd6..1100fb07f7 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -993,7 +993,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; @@ -1005,7 +1004,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 3d8d5b0fe1..e08af2759e 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 284a528a0c..bc1cc43a18 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 */ } |