generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make recently added and still unused read_seek functions return offset_t.

Browse Source 
Originally committed as revision 11274 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-12-19 21:11:08 +00:00
parent 502bdf6893
commit b075e52059
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avio.c
View File

@ -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)

8
libavformat/avio.h
View File

@ -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)

6
libavformat/aviobuf.c
View File

@ -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);