diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:55:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:55:27 +0200 |
| commit | d2a06242966d7a640d32d304a5653f4e1545f259 (patch) | |
| tree | 4bdd35d918730a77eec7a8df8daf6fd759f4dbab | |
| parent | 8f3caf52fc0d75a38137d0cb97d23c8802abd1ce (diff) | |
| parent | 3526ab891c28396ada8b58bf7647309bab30de1d (diff) | |
| download | ffmpeg-d2a06242966d7a640d32d304a5653f4e1545f259.tar.gz | |
Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
qt-faststart: Undefine fseeko/ftello before defining them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/qt-faststart.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index 9cbabd9a8d..97be019c58 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 |