Revert "Prepare for O_DIRECT"

This reverts commit c84778a4e1e6a1123d117482a81fe925325ac010.

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 3340a12cde71f50dfa1bade919532dd047f5120d..be02b06f606b0f9247875669585c16c326c19d27 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -64,7 +64,6 @@ typedef struct URLPollEntry {
 #define URL_RDONLY 0
 #define URL_WRONLY 1
 #define URL_RDWR   2
-#define URL_DIRECT 2           /* Use O_DIRECT for file access */
 
 typedef int URLInterruptCB(void);
 

diff --git a/libavformat/file.c b/libavformat/file.c
index c041e562a9ebe0bf5b66a83e48485260aa25671b..da0ce150947bfb9b1671b740fbb581b3613dfdb3 100644 (file)
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #include "libavutil/avstring.h"
 #include "avformat.h"
 #include <fcntl.h>
@@ -34,13 +33,8 @@
 
 /* standard file protocol */
 
-struct FileContext {
-    int fd;
-};
-
 static int file_open(URLContext *h, const char *filename, int flags)
 {
-    struct FileContext *s = h->priv_data;
     int access;
     int fd;
 
@@ -56,45 +50,35 @@ static int file_open(URLContext *h, const char *filename, int flags)
 #ifdef O_BINARY
     access |= O_BINARY;
 #endif
-    s = av_malloc(sizeof(struct FileContext));
-    if (!s)
-       return AVERROR(ENOMEM);
-    if (flags & URL_DIRECT)
-       access |= O_DIRECT;
     fd = open(filename, access, 0666);
     if (fd < 0)
         return AVERROR(ENOENT);
-    s->fd = fd;
-    h->priv_data = (void *) s;
+    h->priv_data = (void *) (intptr_t) fd;
     return 0;
 }
 
 static int file_read(URLContext *h, unsigned char *buf, int size)
 {
-    struct FileContext *s = h->priv_data;
-    int fd = s->fd;
+    int fd = (intptr_t) h->priv_data;
     return read(fd, buf, size);
 }
 
 static int file_write(URLContext *h, unsigned char *buf, int size)
 {
-    struct FileContext *s = h->priv_data;
-    int fd = s->fd;
+    int fd = (intptr_t) h->priv_data;
     return write(fd, buf, size);
 }
 
 /* XXX: use llseek */
 static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
-    struct FileContext *s = h->priv_data;
-    int fd = s->fd;
+    int fd = (intptr_t) h->priv_data;
     return lseek(fd, pos, whence);
 }
 
 static int file_close(URLContext *h)
 {
-    struct FileContext *s = h->priv_data;
-    int fd = s->fd;
+    int fd = (intptr_t) h->priv_data;
     return close(fd);
 }