[FFmpeg-cvslog] qt-faststart: Undefine fseeko/ftello before defining them

Diego Biurrun git at videolan.org
Fri Aug 22 22:01:22 CEST 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Aug 15 21:43:48 2014 +0200| [3526ab891c28396ada8b58bf7647309bab30de1d] | committer: Diego Biurrun

qt-faststart: Undefine fseeko/ftello before defining them

This avoids a number of redefinition warnings on MinGW64.

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

 tools/qt-faststart.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index ed6de1b..0db5ca2 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -30,10 +30,14 @@
 #include <string.h>
 
 #ifdef __MINGW32__
+#undef fseeko
 #define fseeko(x, y, z) fseeko64(x, y, z)
+#undef ftello
 #define ftello(x)       ftello64(x)
 #elif defined(_WIN32)
+#undef fseeko
 #define fseeko(x, y, z) _fseeki64(x, y, z)
+#undef ftello
 #define ftello(x)       _ftelli64(x)
 #endif
 



More information about the ffmpeg-cvslog mailing list