[FFmpeg-cvslog] x86: fdct: Employ more specific ifdefs

Diego Biurrun git at videolan.org
Mon Oct 7 11:42:29 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Sep 16 13:58:26 2013 +0200| [ce1e8045e04ed1a6e9c8c20e48ad3acf9cf664d2] | committer: Diego Biurrun

x86: fdct: Employ more specific ifdefs

This avoids building mmxext and sse2 code when disabled by configure.

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

 libavcodec/x86/fdct.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index bd76648..6d595aa 100644
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -34,7 +34,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/dct.h"
 
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -556,6 +556,10 @@ void ff_fdct_mmx(int16_t *block)
     }
 }
 
+#endif /* HAVE_MMX_INLINE */
+
+#if HAVE_MMXEXT_INLINE
+
 void ff_fdct_mmxext(int16_t *block)
 {
     DECLARE_ALIGNED(8, int64_t, align_tmp)[16];
@@ -574,6 +578,10 @@ void ff_fdct_mmxext(int16_t *block)
     }
 }
 
+#endif /* HAVE_MMXEXT_INLINE */
+
+#if HAVE_SSE2_INLINE
+
 void ff_fdct_sse2(int16_t *block)
 {
     DECLARE_ALIGNED(16, int64_t, align_tmp)[16];
@@ -583,4 +591,4 @@ void ff_fdct_sse2(int16_t *block)
     fdct_row_sse2(block1, block);
 }
 
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_SSE2_INLINE */



More information about the ffmpeg-cvslog mailing list