virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

Browse Source 
* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-22 21:55:00 +02:00
parent 8f3caf52fc 3526ab891c
commit d2a0624296
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/qt-faststart.c
View File

@@ -30,10 +30,14 @@
#include <string.h> #include <string.h>
#ifdef __MINGW32__ #ifdef __MINGW32__
#undef fseeko
#define fseeko(x, y, z) fseeko64(x, y, z) #define fseeko(x, y, z) fseeko64(x, y, z)
#undef ftello
#define ftello(x) ftello64(x) #define ftello(x) ftello64(x)
#elif defined(_WIN32) #elif defined(_WIN32)
#undef fseeko
#define fseeko(x, y, z) _fseeki64(x, y, z) #define fseeko(x, y, z) _fseeki64(x, y, z)
#undef ftello
#define ftello(x) _ftelli64(x) #define ftello(x) _ftelli64(x)
#endif #endif