[xiph-commits] r18423 - in trunk/ffmpeg2theora: scons-tools src

[j at svn.xiph.org]

Author: j
Date: 2012-06-21 14:36:01 -0700 (Thu, 21 Jun 2012)
New Revision: 18423

Modified:
   trunk/ffmpeg2theora/scons-tools/crossmingw.py
   trunk/ffmpeg2theora/src/theorautils.c
Log:
fix cross compile build with mingw-w64-i686

Modified: trunk/ffmpeg2theora/scons-tools/crossmingw.py
===================================================================
--- trunk/ffmpeg2theora/scons-tools/crossmingw.py	2012-06-21 19:18:16 UTC (rev 18422)
+++ trunk/ffmpeg2theora/scons-tools/crossmingw.py	2012-06-21 21:36:01 UTC (rev 18423)
@@ -44,6 +44,7 @@
     i486-mingw32msvc-
     i586-mingw32msvc-
     i686-mingw32msvc-
+    i686-w64-mingw32-
 """)
 
 def find(env):

Modified: trunk/ffmpeg2theora/src/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/src/theorautils.c	2012-06-21 19:18:16 UTC (rev 18422)
+++ trunk/ffmpeg2theora/src/theorautils.c	2012-06-21 21:36:01 UTC (rev 18423)
@@ -36,11 +36,6 @@
 #endif
 #endif
 
-#ifdef WIN32
-#define fseeko fseeko64
-#define ftello ftello64
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -51,6 +46,13 @@
 #include <math.h>
 #include <limits.h>
 
+#ifdef WIN32
+#if !defined(fseeko)
+#define fseeko fseeko64
+#define ftello ftello64
+#endif
+#endif
+
 #include "theora/theoraenc.h"
 #include "vorbis/codec.h"
 #include "vorbis/vorbisenc.h"