diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-07-25 11:59:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-07-25 11:59:34 +0000 |
| commit | 53e2f9caf80ed385a3d4cfb9200d8827b65580ef (patch) | |
| tree | 821ceae2581e009ac37615348e25a5be6f6c4578 /libavformat/aviobuf.c | |
| parent | ebb177ddef238db201a2bbbf0db21a6d7fbeba32 (diff) | |
| download | ffmpeg-53e2f9caf80ed385a3d4cfb9200d8827b65580ef.tar.gz | |
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 3838e46669..0ad63299a4 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -148,7 +148,8 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) return -EPIPE; s->buf_ptr = s->buffer; s->buf_end = s->buffer; - s->seek(s->opaque, offset, SEEK_SET); + if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) + return -EPIPE; s->pos = offset; } s->eof_reached = 0; @@ -449,8 +450,8 @@ static int url_read_packet(void *opaque, uint8_t *buf, int buf_size) static int url_seek_packet(void *opaque, int64_t offset, int whence) { URLContext *h = opaque; - url_seek(h, offset, whence); - return 0; + return url_seek(h, offset, whence); + //return 0; } int url_fdopen(ByteIOContext *s, URLContext *h) |