Commit 9fc602d8 authored by michael's avatar michael

Make recently added and still unused read_seek functions return offset_t.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11274 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fc80c999
...@@ -199,7 +199,7 @@ int av_url_read_pause(URLContext *h, int pause) ...@@ -199,7 +199,7 @@ int av_url_read_pause(URLContext *h, int pause)
return h->prot->url_read_pause(h, 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) int stream_index, int64_t timestamp, int flags)
{ {
if (!h->prot->url_read_seek) if (!h->prot->url_read_seek)
......
...@@ -105,7 +105,7 @@ int av_url_read_pause(URLContext *h, int pause); ...@@ -105,7 +105,7 @@ int av_url_read_pause(URLContext *h, int pause);
* @return >= 0 on success * @return >= 0 on success
* @see AVInputFormat::read_seek * @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); int stream_index, int64_t timestamp, int flags);
/** /**
...@@ -124,7 +124,7 @@ typedef struct URLProtocol { ...@@ -124,7 +124,7 @@ typedef struct URLProtocol {
int (*url_close)(URLContext *h); int (*url_close)(URLContext *h);
struct URLProtocol *next; struct URLProtocol *next;
int (*url_read_pause)(URLContext *h, int pause); 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); int stream_index, int64_t timestamp, int flags);
} URLProtocol; } URLProtocol;
...@@ -154,7 +154,7 @@ typedef struct { ...@@ -154,7 +154,7 @@ typedef struct {
unsigned long (*update_checksum)(unsigned long checksum, const uint8_t *buf, unsigned int size); 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 error; ///< contains the error code or 0 if no error happened
int (*read_pause)(void *opaque, int pause); 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); int stream_index, int64_t timestamp, int flags);
} ByteIOContext; } ByteIOContext;
...@@ -189,7 +189,7 @@ int url_feof(ByteIOContext *s); ...@@ -189,7 +189,7 @@ int url_feof(ByteIOContext *s);
int url_ferror(ByteIOContext *s); int url_ferror(ByteIOContext *s);
int av_url_read_fpause(ByteIOContext *h, int pause); 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); int stream_index, int64_t timestamp, int flags);
#define URL_EOF (-1) #define URL_EOF (-1)
......
...@@ -532,7 +532,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h) ...@@ -532,7 +532,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
(*s)->max_packet_size = max_packet_size; (*s)->max_packet_size = max_packet_size;
if(h->prot) { if(h->prot) {
(*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; (*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; return 0;
} }
...@@ -646,11 +646,11 @@ int av_url_read_fpause(ByteIOContext *s, int pause) ...@@ -646,11 +646,11 @@ int av_url_read_fpause(ByteIOContext *s, int pause)
return s->read_pause(s->opaque, 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) int stream_index, int64_t timestamp, int flags)
{ {
URLContext *h = s->opaque; URLContext *h = s->opaque;
int ret; offset_t ret;
if (!s->read_seek) if (!s->read_seek)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
ret = s->read_seek(h, stream_index, timestamp, flags); ret = s->read_seek(h, stream_index, timestamp, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment