From 493f54ada083b4d6c8f14f02607224fe258c211c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 15 Mar 2010 22:54:22 +0000 Subject: Add AVSEEK_FORCE flag to indicate that the code should attempt to seek by any means. Originally committed as revision 22557 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/aviobuf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavformat/aviobuf.c') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 1cbed1d5e7..29d0715357 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -150,8 +150,9 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence) offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) { /* can do the seek inside the buffer */ s->buf_ptr = s->buffer + offset1; - } else if(s->is_streamed && !s->write_flag && - offset1 >= 0 && offset1 < (s->buf_end - s->buffer) + (1<<16)){ + } else if(s->is_streamed && !s->write_flag && offset1 >= 0 && + ( offset1 < (s->buf_end - s->buffer) + (1<<16) + || (whence & AVSEEK_FORCE))){ while(s->pos < offset && !s->eof_reached) fill_buffer(s); if (s->eof_reached) -- cgit v1.2.3