Use setmode() if it exists in <io.h>, and not based on O_BINARY.

Originally committed as revision 16553 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 6916df471bd16550a69b94e1d493bc343a41242f..37af6c4bca0e4882b946ab8ecb69d54589b782de 100755 (executable)
--- a/configure
+++ b/configure
@@ -875,6 +875,7 @@ HAVE_LIST="
     roundf
     sdl
     sdl_video_size
+    setmode
     socklen_t
     soundcard_h
     poll_h
@@ -1823,6 +1824,7 @@ check_func  inet_aton $network_extralibs
 check_func  memalign
 check_func  mkstemp
 check_func  posix_memalign
+check_func_headers io.h setmode
 check_func_headers windows.h GetProcessTimes
 
 check_header conio.h

diff --git a/libavformat/file.c b/libavformat/file.c
index e50168d89e8f8917bef4a8535c076a6abbf8177d..827541d1ae7b50634e98da762fa9a6113c9b5e9c 100644 (file)
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -22,6 +22,9 @@
 #include "libavutil/avstring.h"
 #include "avformat.h"
 #include <fcntl.h>
+#ifdef HAVE_SETMODE
+#include <io.h>
+#endif
 #include <unistd.h>
 #include <sys/time.h>
 #include <stdlib.h>
@@ -104,7 +107,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
             fd = 0;
         }
     }
-#ifdef O_BINARY
+#ifdef HAVE_SETMODE
     setmode(fd, O_BINARY);
 #endif
     h->priv_data = (void *)(size_t)fd;