Merge recently added and still unused play and pause functions.

Originally committed as revision 11273 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-12-19 20:57:13 +00:00
parent 79e42311d3
commit 502bdf6893
4 changed files with 17 additions and 36 deletions

View File

@ -55,7 +55,6 @@ int init_put_byte(ByteIOContext *s,
s->pos = buffer_size;
s->buf_end = s->buffer + buffer_size;
}
s->read_play = NULL;
s->read_pause = NULL;
s->read_seek = NULL;
return 0;
@ -532,8 +531,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
(*s)->is_streamed = h->is_streamed;
(*s)->max_packet_size = max_packet_size;
if(h->prot) {
(*s)->read_play = (int (*)(void *))h->prot->url_read_play;
(*s)->read_pause = (int (*)(void *))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;
}
return 0;
@ -641,18 +639,11 @@ int url_fget_max_packet_size(ByteIOContext *s)
return s->max_packet_size;
}
int av_url_read_fplay(ByteIOContext *s)
{
if (!s->read_play)
return AVERROR(ENOSYS);
return s->read_play(s->opaque);
}
int av_url_read_fpause(ByteIOContext *s)
int av_url_read_fpause(ByteIOContext *s, int pause)
{
if (!s->read_pause)
return AVERROR(ENOSYS);
return s->read_pause(s->opaque);
return s->read_pause(s->opaque, pause);
}
int av_url_read_fseek(ByteIOContext *s,