[FFmpeg-cvslog] x86/mpegaudiodec: drop likely now unneeded #if HAVE_AVX_EXTERNAL
Michael Niedermayer
git at videolan.org
Tue Sep 18 17:54:15 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 18 16:15:17 2012 +0200| [efac6f7472c4c372cd336dd88cf8a1ed363cccd6] | committer: Michael Niedermayer
x86/mpegaudiodec: drop likely now unneeded #if HAVE_AVX_EXTERNAL
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efac6f7472c4c372cd336dd88cf8a1ed363cccd6
---
libavcodec/x86/mpegaudiodec.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/x86/mpegaudiodec.c b/libavcodec/x86/mpegaudiodec.c
index 0842b70..a8b55ae 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;
More information about the ffmpeg-cvslog
mailing list