From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 4 Jan 2014 16:33:59 +0000 (+0100)
Subject: avformat/oggdec: dont read timestamps from EOS pages of ogm videos
X-Git-Tag: android-x86-6.0-r1~7950
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e0c7eab2a9d43e6e3be967ec1a6b04a3e0328da;p=android-x86%2Fexternal-ffmpeg.git

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 <michaelni@gmx.at>
---

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