diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-12-19 20:57:13 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-12-19 20:57:13 +0000 |
| commit | 502bdf68937d71006d55aebd9da98e750bce4010 (patch) | |
| tree | a0d144e92dac0b6f9b18593eaa31a544564130a3 /libavformat/aviobuf.c | |
| parent | 79e42311d3b8a7e8efb85866c1cec120da6d0983 (diff) | |
| download | ffmpeg-502bdf68937d71006d55aebd9da98e750bce4010.tar.gz | |
Merge recently added and still unused play and pause functions.
Originally committed as revision 11273 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index d3777d15c0..025e0b6980 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -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, |