Mercurial > libavformat.hg
changeset 2840:f51675f78402 libavformat
Make recently added and still unused read_seek functions return offset_t.
| author | michael |
|---|---|
| date | Wed, 19 Dec 2007 21:11:08 +0000 |
| parents | b51319dd86e5 |
| children | a41a1ec2213c |
| files | avio.c avio.h aviobuf.c |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/avio.c Wed Dec 19 20:57:13 2007 +0000 +++ b/avio.c Wed Dec 19 21:11:08 2007 +0000 @@ -199,7 +199,7 @@ 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)
--- a/avio.h Wed Dec 19 20:57:13 2007 +0000 +++ b/avio.h Wed Dec 19 21:11:08 2007 +0000 @@ -105,7 +105,7 @@ * @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 @@ 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 @@ 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_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)
--- a/aviobuf.c Wed Dec 19 20:57:13 2007 +0000 +++ b/aviobuf.c Wed Dec 19 21:11:08 2007 +0000 @@ -532,7 +532,7 @@ (*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 @@ 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);