RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flvdec: perform duration search just once 

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

4
libavformat/flvdec.c
View File

@ -52,6 +52,7 @@ typedef struct {
} validate_index[2]; } validate_index[2];
int validate_next; int validate_next;
int validate_count; int validate_count;
int searched_for_end;
} FLVContext; } FLVContext;
static int flv_probe(AVProbeData *p) static int flv_probe(AVProbeData *p)
@ -744,7 +745,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
// if not streamed and no duration from metadata then seek to end to find the duration from the timestamps // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE)){ 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); const int64_t fsize= avio_size(s->pb);
@ -757,6 +758,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
s->duration = ts * (int64_t)AV_TIME_BASE / 1000; s->duration = ts * (int64_t)AV_TIME_BASE / 1000;
} }
avio_seek(s->pb, pos, SEEK_SET); avio_seek(s->pb, pos, SEEK_SET);
flv->searched_for_end = 1;
} }
if(stream_type == FLV_STREAM_TYPE_AUDIO){ if(stream_type == FLV_STREAM_TYPE_AUDIO){