diff mbox

[FFmpeg-devel,2/2] avformat/oggparsedaala: Do not adjust AV_NOPTS_VALUE

Message ID 20180308191327.22228-2-michael@niedermayer.cc
State Accepted
Commit f655ddfb47e8484b205b14c7f871c643ad24d701
Headers show

Commit Message

Michael Niedermayer March 8, 2018, 7:13 p.m. UTC 
Fixes: potential signed integer overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/oggparsedaala.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c
index a373b41b4c..e944470aca 100644
--- a/libavformat/oggparsedaala.c
+++ b/libavformat/oggparsedaala.c
@@ -218,6 +218,7 @@  static int daala_packet(AVFormatContext *s, int idx)
     int seg, duration = 1;
     struct ogg *ogg = s->priv_data;
     struct ogg_stream *os = ogg->streams + idx;
+    int64_t pts;
 
     /*
      * first packet handling: here we parse the duration of each packet in the
@@ -230,7 +231,10 @@  static int daala_packet(AVFormatContext *s, int idx)
             if (os->segments[seg] < 255)
                 duration++;
 
-        os->lastpts = os->lastdts = daala_gptopts(s, idx, os->granule, NULL) - duration;
+        pts = daala_gptopts(s, idx, os->granule, NULL);
+        if (pts != AV_NOPTS_VALUE)
+            pts -= duration;
+        os->lastpts = os->lastdts = pts;
         if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
             s->streams[idx]->start_time = os->lastpts;
             if (s->streams[idx]->duration != AV_NOPTS_VALUE)