[FFmpeg-cvslog] Merge commit '233d50b275dd7cf6cc0656851e670e1b2dfba56f'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr  4 15:58:11 2017 -0300| [2c40adf218c8991769fd6f55deffdea697361e3d] | committer: James Almer

Merge commit '233d50b275dd7cf6cc0656851e670e1b2dfba56f'

* commit '233d50b275dd7cf6cc0656851e670e1b2dfba56f':
  qt-faststart: Do not try to use fancy 64-bit seeking functions on mingw32ce

Merged-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index 97be019..728f80c 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -29,7 +29,10 @@
 #include <inttypes.h>
 #include <string.h>
 
-#ifdef __MINGW32__
+#ifdef __MINGW32CE__
+#define fseeko(x, y, z) fseek(x, y, z)
+#define ftello(x)       ftell(x)
+#elif defined(__MINGW32__)
 #undef fseeko
 #define fseeko(x, y, z) fseeko64(x, y, z)
 #undef ftello


======================================================================