diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 18:34:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 18:39:03 +0200 |
| commit | 44f83930d91fdb249f8b92198d1b4c2ae12d5c48 (patch) | |
| tree | a8df728fe60cd9b7d1f30e7e516a6540829cb15f | |
| parent | 3629d1c09dc400657d4f65959dc173a82bacc7b3 (diff) | |
| download | ffmpeg-44f83930d91fdb249f8b92198d1b4c2ae12d5c48.tar.gz | |
x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx
this is a regression since today
Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/mpegaudiodec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c index edf630b31d..cbc1e464c3 100644 --- a/libavcodec/x86/mpegaudiodec.c +++ b/libavcodec/x86/mpegaudiodec.c @@ -252,9 +252,12 @@ void ff_mpadsp_init_mmx(MPADSPContext *s) #endif /* HAVE_SSE2_INLINE */ #if HAVE_YASM +#if HAVE_AVX_EXTERNAL if (EXTERNAL_AVX(mm_flags)) { s->imdct36_blocks_float = imdct36_blocks_avx; - } else if (EXTERNAL_SSSE3(mm_flags)) { + } else +#endif + if (EXTERNAL_SSSE3(mm_flags)) { s->imdct36_blocks_float = imdct36_blocks_ssse3; } else if (EXTERNAL_SSE3(mm_flags)) { s->imdct36_blocks_float = imdct36_blocks_sse3; |