From 4955d860172a57410a07db63b92e9f0fc62c1ad9 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Tue, 30 Jan 2007 10:48:39 +0000 Subject: [PATCH] Fix misbehaviour in url_fseek() when seeking fails. The return value of the seek function is -1 on error, not -EPIPE (the return value in url_seek() if no seek function pointer is set) Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net % Original thread: date: Dec 31, 2006 9:25 PM subject: [Ffmpeg-devel] Re: [PATCH] file length handling git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7766 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavformat/aviobuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index ab8fc1da3..ca93c64c8 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -136,6 +136,8 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) fill_buffer(s); s->buf_ptr = s->buf_end + offset - s->pos; } else { + offset_t res = -EPIPE; + #if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) if (s->write_flag) { flush_buffer(s); @@ -146,8 +148,8 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) s->buf_end = s->buffer; } s->buf_ptr = s->buffer; - if (!s->seek || s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) - return -EPIPE; + if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0) + return res; s->pos = offset; } s->eof_reached = 0; -- 2.39.2