[SCM] libav/experimental: http: Always allow no-op seek
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:00 UTC 2014
The following commit has been merged in the experimental branch:
commit ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab
Author: Anssi Hannula <anssi.hannula at iki.fi>
Date: Thu Mar 6 18:40:01 2014 +0100
http: Always allow no-op seek
This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
diff --git a/libavformat/http.c b/libavformat/http.c
index 2009621..cf4ccab 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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list