aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/http.c
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2014-03-06 18:40:01 +0100
committerLuca Barbato <lu_zero@gentoo.org>2014-03-11 22:08:57 +0100
commitab76d9f628ad46e1d3bbf26c5bf1f87083f239ab (patch)
tree91ef3a60d7e1ca0a6e1c28490597e8d69d4d3795 /libavformat/http.c
parent2ec33d27127251bbc45e1f88e60691ad59cf2319 (diff)
downloadffmpeg-ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab.tar.gz
http: Always allow no-op seek
This also allows checking stream position as per ffurl_seek() doxy. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/http.c')
-rw-r--r--libavformat/http.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index 2009621c1e..cf4ccab7e0 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -901,6 +901,9 @@ 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))
+ return s->off;
else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed)
return AVERROR(ENOSYS);