From 5e0c7eab2a9d43e6e3be967ec1a6b04a3e0328da Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 4 Jan 2014 17:33:59 +0100 Subject: [PATCH] avformat/oggdec: dont read timestamps from EOS pages of ogm videos Some muxers store invalid timestamps there, which breaks seeking Fixes Ticket2739 Signed-off-by: Michael Niedermayer --- libavformat/oggdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 04405cf5a5..efb8f04a9c 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -808,6 +808,11 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index, && !ogg_packet(s, &i, &pstart, &psize, pos_arg)) { if (i == stream_index) { struct ogg_stream *os = ogg->streams + stream_index; + // Dont trust the last timestamps of a ogm video + if ( (os->flags & OGG_FLAG_EOS) + && !(os->flags & OGG_FLAG_BOS) + && os->codec == &ff_ogm_video_codec) + continue; pts = ogg_calc_pts(s, i, NULL); ogg_validate_keyframe(s, i, pstart, psize); if (os->pflags & AV_PKT_FLAG_KEY) {