diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-09-04 08:30:16 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-09-07 18:16:04 +0200 |
| commit | 1169f0d0afc0454633cfcfad73643f0458521c67 (patch) | |
| tree | c58d3888c6bbd2e4eb014ddfce38bf9044d2312b /libavcodec/x86/mpegaudiodec.c | |
| parent | 8cb7ed5562c438388b1dd7dc7d10c26f54c740b5 (diff) | |
| download | ffmpeg-1169f0d0afc0454633cfcfad73643f0458521c67.tar.gz | |
x86: more specific checks for availability of required assembly capabilities
Diffstat (limited to 'libavcodec/x86/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c index d2573dd274..e7c7fbbf48 100644 --- a/libavcodec/x86/mpegaudiodec.c +++ b/libavcodec/x86/mpegaudiodec.c @@ -36,7 +36,7 @@ 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 +#if HAVE_SSE2_INLINE #define MACS(rt, ra, rb) rt+=(ra)*(rb) #define MLSS(rt, ra, rb) rt-=(ra)*(rb) @@ -180,7 +180,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out, *out = sum; } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_SSE2_INLINE */ #if HAVE_YASM #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ @@ -240,11 +240,12 @@ void ff_mpadsp_init_mmx(MPADSPContext *s) } } -#if HAVE_INLINE_ASM +#if HAVE_SSE2_INLINE if (mm_flags & AV_CPU_FLAG_SSE2) { s->apply_window_float = apply_window_mp3; } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_SSE2_INLINE */ + #if HAVE_YASM if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { s->imdct36_blocks_float = imdct36_blocks_avx; |