[FFmpeg-cvslog] mpegaudio: bury inline asm under HAVE_INLINE_ASM.

Ronald S. Bultje git at videolan.org
Sat Jul 28 00:10:45 CEST 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Jul 25 20:32:58 2012 -0700| [bde73f28afe05054169eded9bb07e15466d1f4da] | committer: Ronald S. Bultje

mpegaudio: bury inline asm under HAVE_INLINE_ASM.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bde73f28afe05054169eded9bb07e15466d1f4da
---

 libavcodec/x86/mpegaudiodec_mmx.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/x86/mpegaudiodec_mmx.c b/libavcodec/x86/mpegaudiodec_mmx.c
index f51a06d..88a3477 100644
--- a/libavcodec/x86/mpegaudiodec_mmx.c
+++ b/libavcodec/x86/mpegaudiodec_mmx.c
@@ -36,6 +36,8 @@ void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win,
 
 DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40];
 
+#if HAVE_INLINE_ASM
+
 #define MACS(rt, ra, rb) rt+=(ra)*(rb)
 #define MLSS(rt, ra, rb) rt-=(ra)*(rb)
 
@@ -178,6 +180,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
     *out = sum;
 }
 
+#endif /* HAVE_INLINE_ASM */
 
 #define DECL_IMDCT_BLOCKS(CPU1, CPU2)                                       \
 static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in,      \
@@ -235,9 +238,11 @@ void ff_mpadsp_init_mmx(MPADSPContext *s)
         }
     }
 
+#if HAVE_INLINE_ASM
     if (mm_flags & AV_CPU_FLAG_SSE2) {
         s->apply_window_float = apply_window_mp3;
     }
+#endif /* HAVE_INLINE_ASM */
 #if HAVE_YASM
     if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) {
         s->imdct36_blocks_float = imdct36_blocks_avx;



More information about the ffmpeg-cvslog mailing list