[FFmpeg-cvslog] avformat/cache: Use the correct io handle in seeking
Michael Niedermayer
git at videolan.org
Thu Dec 25 22:11:05 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 25 21:30:10 2014 +0100| [7018d3d3510ee5be4fabd95b011373f9e826f897] | committer: Michael Niedermayer
avformat/cache: Use the correct io handle in seeking
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7018d3d3510ee5be4fabd95b011373f9e826f897
---
libavformat/cache.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavformat/cache.c b/libavformat/cache.c
index ac9a8d2..48a342f 100644
--- a/libavformat/cache.c
+++ b/libavformat/cache.c
@@ -195,6 +195,7 @@ static int cache_read(URLContext *h, unsigned char *buf, int size)
static int64_t cache_seek(URLContext *h, int64_t pos, int whence)
{
Context *c= h->priv_data;
+ int64_t ret;
if (whence == AVSEEK_SIZE) {
pos= ffurl_seek(c->inner, pos, whence);
@@ -224,13 +225,14 @@ static int64_t cache_seek(URLContext *h, int64_t pos, int whence)
}
//cache miss
- pos = lseek(c->fd, pos, whence);
- if (pos >= 0) {
- c->logical_pos = pos;
- c->end = FFMAX(c->end, pos);
+ ret= ffurl_seek(c->inner, pos, whence);
+
+ if (ret >= 0) {
+ c->logical_pos = ret;
+ c->end = FFMAX(c->end, ret);
}
- return pos;
+ return ret;
}
static int cache_close(URLContext *h)
More information about the ffmpeg-cvslog
mailing list