Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / os_support.h

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index fca5b2a813e963f308ed126cfd8499c6b68d07d6..159d4d7f85858c51a68cf02df5358f4622f1103e 100644 (file)
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -31,6 +31,9 @@
 
 #if defined(__MINGW32__) && !defined(__MINGW32CE__)
 #  include <fcntl.h>
+#  ifdef lseek
+#   undef lseek
+#  endif
 #  define lseek(f,p,w) _lseeki64((f), (p), (w))
 #  define stat _stati64
 #  define fstat(f,s) _fstati64((f), (s))