[xiph-commits] r13935 - trunk/theora/lib/enc/x86_64

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2007-10-04 13:18:48 -0700 (Thu, 04 Oct 2007)
New Revision: 13935

Modified:
   trunk/theora/lib/enc/x86_64/dsp_mmx.c
   trunk/theora/lib/enc/x86_64/dsp_mmxext.c
   trunk/theora/lib/enc/x86_64/fdct_mmx.c
   trunk/theora/lib/enc/x86_64/recon_mmx.c
Log:
Test for USE_ASM _after_ including codec_internal.h, so config.h can get
 processed.


Modified: trunk/theora/lib/enc/x86_64/dsp_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/dsp_mmx.c	2007-10-04 18:41:18 UTC (rev 13934)
+++ trunk/theora/lib/enc/x86_64/dsp_mmx.c	2007-10-04 20:18:48 UTC (rev 13935)
@@ -15,13 +15,13 @@
 
  ********************************************************************/
 
-#ifdef USE_ASM
-
 #include <stdlib.h>
 
 #include "codec_internal.h"
 #include "dsp.h"
 
+#if defined(USE_ASM)
+
 typedef unsigned long long ogg_uint64_t;
 
 static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x0080008000800080LL;

Modified: trunk/theora/lib/enc/x86_64/dsp_mmxext.c
===================================================================
--- trunk/theora/lib/enc/x86_64/dsp_mmxext.c	2007-10-04 18:41:18 UTC (rev 13934)
+++ trunk/theora/lib/enc/x86_64/dsp_mmxext.c	2007-10-04 20:18:48 UTC (rev 13935)
@@ -15,13 +15,13 @@
 
  ********************************************************************/
 
-#ifdef USE_ASM
-
 #include <stdlib.h>
 
 #include "codec_internal.h"
 #include "dsp.h"
 
+#if defined(USE_ASM)
+
 typedef unsigned long long ogg_uint64_t;
 
 static ogg_uint32_t sad8x8__mmxext (unsigned char *ptr1, ogg_uint32_t stride1,

Modified: trunk/theora/lib/enc/x86_64/fdct_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/fdct_mmx.c	2007-10-04 18:41:18 UTC (rev 13934)
+++ trunk/theora/lib/enc/x86_64/fdct_mmx.c	2007-10-04 20:18:48 UTC (rev 13935)
@@ -13,12 +13,12 @@
 /* mmx fdct implementation for x86_64 */
 /* $Id$ */
 
-#ifdef USE_ASM
-
 #include "theora/theora.h"
 #include "codec_internal.h"
 #include "dsp.h"
 
+#if defined(USE_ASM)
+
 static const __attribute__ ((aligned(8),used)) ogg_int64_t xC1S7 = 0x0fb15fb15fb15fb15LL;
 static const __attribute__ ((aligned(8),used)) ogg_int64_t xC2S6 = 0x0ec83ec83ec83ec83LL;
 static const __attribute__ ((aligned(8),used)) ogg_int64_t xC3S5 = 0x0d4dbd4dbd4dbd4dbLL;

Modified: trunk/theora/lib/enc/x86_64/recon_mmx.c
===================================================================
--- trunk/theora/lib/enc/x86_64/recon_mmx.c	2007-10-04 18:41:18 UTC (rev 13934)
+++ trunk/theora/lib/enc/x86_64/recon_mmx.c	2007-10-04 20:18:48 UTC (rev 13935)
@@ -15,10 +15,10 @@
 
  ********************************************************************/
 
-#ifdef USE_ASM
-
 #include "codec_internal.h"
 
+#if defined(USE_ASM)
+
 typedef unsigned long long ogg_uint64_t;
 
 static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x8080808080808080LL;