RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 13:04:50 +00:00
Code Issues Projects Releases Wiki Activity

flvdec: follow packets backward until a valid last timestamp is found

Browse Source 
Fixed Ticket981

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-03 14:41:18 +02:00
parent 71a5cd7dbc
commit 231ffb9243
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/flvdec.c
View File

@ -748,15 +748,22 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE) && !flv->searched_for_end){ if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE) && !flv->searched_for_end){
int size; int size;
const int64_t pos= avio_tell(s->pb); const int64_t pos= avio_tell(s->pb);
const int64_t fsize= avio_size(s->pb); int64_t fsize= avio_size(s->pb);
retry_duration:
avio_seek(s->pb, fsize-4, SEEK_SET); avio_seek(s->pb, fsize-4, SEEK_SET);
size= avio_rb32(s->pb); size= avio_rb32(s->pb);
avio_seek(s->pb, fsize-3-size, SEEK_SET); avio_seek(s->pb, fsize-3-size, SEEK_SET);
if(size == avio_rb24(s->pb) + 11){ if(size == avio_rb24(s->pb) + 11){
uint32_t ts = avio_rb24(s->pb); uint32_t ts = avio_rb24(s->pb);
ts |= avio_r8(s->pb) << 24; ts |= avio_r8(s->pb) << 24;
s->duration = ts * (int64_t)AV_TIME_BASE / 1000; if(ts)
s->duration = ts * (int64_t)AV_TIME_BASE / 1000;
else if (fsize >= 8 && fsize - 8 >= size){
fsize -= size+4;
goto retry_duration;
}
} }
avio_seek(s->pb, pos, SEEK_SET); avio_seek(s->pb, pos, SEEK_SET);
flv->searched_for_end = 1; flv->searched_for_end = 1;
} }