commit 2dea9a1266c302912572c182739632af3c00d970
author Reinhard Tartler <siretart@tauware.de> Sun Oct 03 14:50:04 2010 +0000
committer Reinhard Tartler <siretart@tauware.de> Sun Oct 03 14:50:04 2010 +0000
tree 12c3655059e0293ec20b3545f229ca4dcd155caf
parent 84e6629de31cad467b7d9378a1faf2358b4f15b4

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

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 9650ecf..3143a23 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -160,8 +160,7 @@
         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)