aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-12-19 21:11:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-12-19 21:11:08 +0000
commitb075e5205915a5ffcbcb5452b8586c11351f0758 (patch)
treeef18da9c356ad06e2f4e2da697c9b695b1bac4df
parent502bdf68937d71006d55aebd9da98e750bce4010 (diff)
downloadffmpeg-b075e5205915a5ffcbcb5452b8586c11351f0758.tar.gz
Make recently added and still unused read_seek functions return offset_t.
Originally committed as revision 11274 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/avio.c2
-rw-r--r--libavformat/avio.h8
-rw-r--r--libavformat/aviobuf.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 8466cd5ee8..b39f80a5f4 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -199,7 +199,7 @@ int av_url_read_pause(URLContext *h, int pause)
return h->prot->url_read_pause(h, pause);
}
-int av_url_read_seek(URLContext *h,
+offset_t av_url_read_seek(URLContext *h,
int stream_index, int64_t timestamp, int flags)
{
if (!h->prot->url_read_seek)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index bdeb502611..66f90d935c 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -105,7 +105,7 @@ int av_url_read_pause(URLContext *h, int pause);
* @return >= 0 on success
* @see AVInputFormat::read_seek
*/
-int av_url_read_seek(URLContext *h,
+offset_t av_url_read_seek(URLContext *h,
int stream_index, int64_t timestamp, int flags);
/**
@@ -124,7 +124,7 @@ typedef struct URLProtocol {
int (*url_close)(URLContext *h);
struct URLProtocol *next;
int (*url_read_pause)(URLContext *h, int pause);
- int (*url_read_seek)(URLContext *h,
+ offset_t (*url_read_seek)(URLContext *h,
int stream_index, int64_t timestamp, int flags);
} URLProtocol;
@@ -154,7 +154,7 @@ typedef struct {
unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size);
int error; ///< contains the error code or 0 if no error happened
int (*read_pause)(void *opaque, int pause);
- int (*read_seek)(void *opaque,
+ offset_t (*read_seek)(void *opaque,
int stream_index, int64_t timestamp, int flags);
} ByteIOContext;
@@ -189,7 +189,7 @@ int url_feof(ByteIOContext *s);
int url_ferror(ByteIOContext *s);
int av_url_read_fpause(ByteIOContext *h, int pause);
-int av_url_read_fseek(ByteIOContext *h,
+offset_t av_url_read_fseek(ByteIOContext *h,
int stream_index, int64_t timestamp, int flags);
#define URL_EOF (-1)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 025e0b6980..45248a95ab 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -532,7 +532,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
(*s)->max_packet_size = max_packet_size;
if(h->prot) {
(*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause;
- (*s)->read_seek = (int (*)(void *, int, int64_t, int))h->prot->url_read_seek;
+ (*s)->read_seek = (offset_t (*)(void *, int, int64_t, int))h->prot->url_read_seek;
}
return 0;
}
@@ -646,11 +646,11 @@ int av_url_read_fpause(ByteIOContext *s, int pause)
return s->read_pause(s->opaque, pause);
}
-int av_url_read_fseek(ByteIOContext *s,
+offset_t av_url_read_fseek(ByteIOContext *s,
int stream_index, int64_t timestamp, int flags)
{
URLContext *h = s->opaque;
- int ret;
+ offset_t ret;
if (!s->read_seek)
return AVERROR(ENOSYS);
ret = s->read_seek(h, stream_index, timestamp, flags);