avformat/oggdec: Skip streams in duration correction that did not had their duration...

Fixes: part of 670190.ogg
Fixes integer overflow

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 47a0cbae0539d8fb4f4ca174d5ab944cb66dad63..e1ef21337c820c4fa7164990eae1a3e3685cd886 100644 (file)
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -643,6 +643,8 @@ static int ogg_get_length(AVFormatContext *s)
         int64_t pts;
         if (i < 0) continue;
         pts = ogg_calc_pts(s, i, NULL);
         int64_t pts;
         if (i < 0) continue;
         pts = ogg_calc_pts(s, i, NULL);

+        if (s->streams[i]->duration == AV_NOPTS_VALUE)
+            continue;

         if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start) {
             s->streams[i]->duration -= pts;
             ogg->streams[i].got_start= 1;
         if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start) {
             s->streams[i]->duration -= pts;
             ogg->streams[i].got_start= 1;