aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-18 16:15:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-18 16:15:17 +0200
commitefac6f7472c4c372cd336dd88cf8a1ed363cccd6 (patch)
treeec4261009ab20a48e3c3bf8c7e81880fe91ae84c /libavcodec/x86
parentc0dfc720ef44bb3d8d7bf30965d15a9584ae73c9 (diff)
downloadffmpeg-efac6f7472c4c372cd336dd88cf8a1ed363cccd6.tar.gz
x86/mpegaudiodec: drop likely now unneeded #if HAVE_AVX_EXTERNAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/mpegaudiodec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c
index 0842b709f2..a8b55aedf0 100644
--- a/libavcodec/x86/mpegaudiodec.c
+++ b/libavcodec/x86/mpegaudiodec.c
@@ -257,12 +257,9 @@ 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
-#endif
- if (EXTERNAL_SSSE3(mm_flags)) {
+ } else 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;