diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
| commit | fb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch) | |
| tree | 61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/libavformat/file.c | |
| parent | 294d01046724e28b7193bcb65bf2a0391b0135b6 (diff) | |
| download | xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2 | |
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/libavformat/file.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/file.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/contrib/ffmpeg/libavformat/file.c b/contrib/ffmpeg/libavformat/file.c index db671698f..3caf80a61 100644 --- a/contrib/ffmpeg/libavformat/file.c +++ b/contrib/ffmpeg/libavformat/file.c @@ -20,14 +20,8 @@ */ #include "avformat.h" #include <fcntl.h> -#ifndef __MINGW32__ #include <unistd.h> -#include <sys/ioctl.h> #include <sys/time.h> -#else -#include <io.h> -#define open(fname,oflag,pmode) _open(fname,oflag,pmode) -#endif /* __MINGW32__ */ /* standard file protocol */ @@ -51,7 +45,7 @@ static int file_open(URLContext *h, const char *filename, int flags) #endif fd = open(filename, access, 0666); if (fd < 0) - return -ENOENT; + return AVERROR(ENOENT); h->priv_data = (void *)(size_t)fd; return 0; } @@ -72,11 +66,7 @@ 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 = (size_t)h->priv_data; -#if defined(__MINGW32__) - return _lseeki64(fd, pos, whence); -#else return lseek(fd, pos, whence); -#endif } static int file_close(URLContext *h) |