diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 22:37:28 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 22:37:28 +0300 |
commit | 0b4fc4bacd866b14b74bcfb1656a1f469da6ad46 (patch) | |
tree | 331df0308031c1b0871b394c96d6999b565bdac7 /libavformat | |
parent | 37984ca13334f1715d33fd490ef243aea6c97c09 (diff) | |
parent | 3c18a7b18807de81566381a1bcbe9f6103c0296b (diff) |
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
avio: Do not consider the end-of-buffer position valid
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 0b0748e954..6a1f83acba 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -228,7 +228,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) offset1 = offset - pos; if (!s->must_flush && (!s->direct || !s->seek) && - offset1 >= 0 && offset1 <= buffer_size) { + offset1 >= 0 && offset1 < buffer_size) { /* can do the seek inside the buffer */ s->buf_ptr = s->buffer + offset1; } else if ((!s->seekable || |