diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:29:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:29:54 +0100 |
| commit | 1cc9468289b266e4a8ff62d520be832f103f0afa (patch) | |
| tree | 9114befa21979cd4ffe0253152214ac01e3e17a8 /libavformat | |
| parent | 76a939d0e58c256d5a340c8a7776eba2c83ff6d2 (diff) | |
| parent | ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab (diff) | |
Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'
* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
http: Always allow no-op seek
Conflicts:
libavformat/http.c
See: 857841c1b63bf3ffacef03da2bd6275d55ead769
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 aa4618b606..b3b8c3a62c 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); |