[FFmpeg-cvslog] r25324 - branches/0.5/libavformat/aviobuf.c

[siretart]

Author: siretart
Date: Sun Oct  3 16:50:04 2010
New Revision: 25324

Log:
unbreak compilation and finish backport r24280 by mstorsjo

Modified:
   branches/0.5/libavformat/aviobuf.c

Modified: branches/0.5/libavformat/aviobuf.c
==============================================================================
--- branches/0.5/libavformat/aviobuf.c	Sun Oct  3 13:56:38 2010	(r25323)
+++ branches/0.5/libavformat/aviobuf.c	Sun Oct  3 16:50:04 2010	(r25324)
@@ -160,8 +160,7 @@ int64_t url_fseek(ByteIOContext *s, int6
         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)