diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:56:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:56:19 +0100 |
| commit | e727cbf0be206e4fe48776735c44b9cdfa96b332 (patch) | |
| tree | b9ad0a2de171d62d5c570ba4363e71ca224fa100 | |
| parent | bcc25353cf259ee63df4c2147630259cd90c8cd5 (diff) | |
| parent | f859fed03d5d039430baea03a0ef35cfd6ac4abd (diff) | |
| download | ffmpeg-e727cbf0be206e4fe48776735c44b9cdfa96b332.tar.gz | |
Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2
* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd':
http: Always allow no-op seek
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/http.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index a06649ff91..51824e9b20 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1048,7 +1048,8 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence) if (whence == AVSEEK_SIZE) return s->filesize; - else if ((whence == SEEK_CUR && off == 0) || (whence == SEEK_SET && off == s->off)) + else if ((whence == SEEK_CUR && off == 0) || + (whence == SEEK_SET && off == s->off)) return s->off; else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed) return AVERROR(ENOSYS); |