Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c'

[ffmpeg] / libavformat / oggdec.h

diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index d7af1cfabdab9c613dc14d8960a7708ec265c012..4a2b6ddee8ff02aaeb489467a6f6fe319606eacf 100644 (file)
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -162,6 +162,11 @@ ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts)
         if (dts)
             *dts = pts;
     }
+    if (pts > INT64_MAX && pts != AV_NOPTS_VALUE) {
+        // The return type is unsigned, we thus cannot return negative pts
+        av_log(s, AV_LOG_ERROR, "invalid pts %"PRId64"\n", pts);
+        pts = AV_NOPTS_VALUE;
+    }
 
     return pts;
 }