generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/cache: Use the correct io handle in seeking

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-25 21:30:10 +01:00
parent dedd3c89ae
commit 7018d3d351
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/cache.c
View File

@@ -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)