[SCM] libav/experimental: x86/synth_filter: remove the fma3 version ifdefs

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:02:49 UTC 2014


The following commit has been merged in the experimental branch:
commit 0f524b6c690962d7ebbd59ded74288e1e9b0f009
Author: James Almer <jamrial at gmail.com>
Date:   Sat Apr 5 14:00:53 2014 -0300

    x86/synth_filter: remove the fma3 version ifdefs
    
    This fixes compilation failures with --disable-fma3
    
    Signed-off-by: James Almer <jamrial at gmail.com>
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm
index 59d96bf..c42ee23 100644
--- a/libavcodec/x86/dcadsp.asm
+++ b/libavcodec/x86/dcadsp.asm
@@ -418,7 +418,5 @@ INIT_XMM sse2
 SYNTH_FILTER
 INIT_YMM avx
 SYNTH_FILTER
-%if HAVE_FMA3_EXTERNAL
 INIT_YMM fma3
 SYNTH_FILTER
-%endif
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c
index beef288..9acb818 100644
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@@ -82,9 +82,7 @@ SYNTH_FILTER_FUNC(sse)
 #endif
 SYNTH_FILTER_FUNC(sse2)
 SYNTH_FILTER_FUNC(avx)
-#if HAVE_FMA3_EXTERNAL
 SYNTH_FILTER_FUNC(fma3)
-#endif
 #endif /* HAVE_YASM */
 
 av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list