[FFmpeg-cvslog] flvdec: perform duration search just once
Michael Niedermayer
git at videolan.org
Fri Aug 3 14:51:06 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 3 14:39:46 2012 +0200| [71a5cd7dbc681ef22e994b92412a8c1a088a2841] | committer: Michael Niedermayer
flvdec: perform duration search just once
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71a5cd7dbc681ef22e994b92412a8c1a088a2841
---
libavformat/flvdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 5b81f39..fb356b8 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -52,6 +52,7 @@ typedef struct {
} validate_index[2];
int validate_next;
int validate_count;
+ int searched_for_end;
} FLVContext;
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(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;
const int64_t pos= avio_tell(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;
}
avio_seek(s->pb, pos, SEEK_SET);
+ flv->searched_for_end = 1;
}
if(stream_type == FLV_STREAM_TYPE_AUDIO){
More information about the ffmpeg-cvslog
mailing list