virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/http: require seekability only when seeking to position != 0

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-09-06 19:05:52 +02:00
parent 1956cfbaed
commit 7990beedee
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/http.c
View File

@@ -1427,7 +1427,7 @@ static int64_t http_seek_internal(URLContext *h, int64_t off, int whence, int fo
((whence == SEEK_CUR && off == 0) || ((whence == SEEK_CUR && off == 0) ||
(whence == SEEK_SET && off == s->off))) (whence == SEEK_SET && off == s->off)))
return s->off; return s->off;
else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed) else if ((s->filesize == -1 && whence == SEEK_END))
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
if (whence == SEEK_CUR) if (whence == SEEK_CUR)
@@ -1440,6 +1440,9 @@ static int64_t http_seek_internal(URLContext *h, int64_t off, int whence, int fo
return AVERROR(EINVAL); return AVERROR(EINVAL);
s->off = off; s->off = off;
if (s->off && h->is_streamed)
return AVERROR(ENOSYS);
/* we save the old context in case the seek fails */ /* we save the old context in case the seek fails */
old_buf_size = s->buf_end - s->buf_ptr; old_buf_size = s->buf_end - s->buf_ptr;
memcpy(old_buf, s->buf_ptr, old_buf_size); memcpy(old_buf, s->buf_ptr, old_buf_size);