From 2dea9a1266c302912572c182739632af3c00d970 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 3 Oct 2010 14:50:04 +0000
Subject: unbreak compilation and finish backport r24280 by mstorsjo

Originally committed as revision 25324 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
---
 libavformat/aviobuf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 9650ecfc9d..3143a23a61 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -160,8 +160,7 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
         s->buf_ptr = s->buffer + offset1;
     } else if ((s->is_streamed ||
                offset1 <= s->buf_end + SHORT_SEEK_THRESHOLD - s->buffer) &&
-               !s->write_flag && offset1 >= 0 &&
-              (whence != SEEK_END || force)) {
+               !s->write_flag && offset1 >= 0) {
         while(s->pos < offset && !s->eof_reached)
             fill_buffer(s);
         if (s->eof_reached)
-- 
cgit v1.2.3