diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-10-03 14:50:04 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-10-03 14:50:04 +0000 |
| commit | 2dea9a1266c302912572c182739632af3c00d970 (patch) | |
| tree | 12c3655059e0293ec20b3545f229ca4dcd155caf | |
| parent | 84e6629de31cad467b7d9378a1faf2358b4f15b4 (diff) | |
| download | ffmpeg-2dea9a1266c302912572c182739632af3c00d970.tar.gz | |
unbreak compilation and finish backport r24280 by mstorsjo
Originally committed as revision 25324 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -rw-r--r-- | libavformat/aviobuf.c | 3 |
1 files changed, 1 insertions, 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) |