http protocol now uses tcp: protocol (simpler)

[ffmpeg] / libav / file.c

diff --git a/libav/file.c b/libav/file.c
index 0b255341c81d0bf45924a4aa1fee834f326af097..8206ff92554da7ffc97496df5d77b7313d8b680e 100644 (file)
--- a/libav/file.c
+++ b/libav/file.c
@@ -1,30 +1,32 @@
 /*
  * Buffered file io for ffmpeg system
- * Copyright (c) 2001 Gerard Lantau
+ * Copyright (c) 2001 Fabrice Bellard
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
+#include "avformat.h"
 #include <fcntl.h>
+#ifndef CONFIG_WIN32
+#include <unistd.h>
 #include <sys/ioctl.h>
-#include <errno.h>
 #include <sys/time.h>
+#else
+#include <io.h>
+#define open(fname,oflag,pmode) _open(fname,oflag,pmode)
+#endif /* CONFIG_WIN32 */
 
-#include "avformat.h"
 
 /* standard file protocol */
 
@@ -38,6 +40,9 @@ static int file_open(URLContext *h, const char *filename, int flags)
     } else {
         access = O_RDONLY;
     }
+#ifdef CONFIG_WIN32
+    access |= O_BINARY;
+#endif
     fd = open(filename, access, 0666);
     if (fd < 0)
         return -ENOENT;
@@ -61,7 +66,11 @@ static int file_write(URLContext *h, unsigned char *buf, int size)
 static offset_t file_seek(URLContext *h, offset_t pos, int whence)
 {
     int fd = (int)h->priv_data;
+#ifdef CONFIG_WIN32
+    return _lseeki64(fd, pos, whence);
+#else
     return lseek(fd, pos, whence);
+#endif
 }
 
 static int file_close(URLContext *h)