[FFmpeg-cvslog] avformat/mov: Only set pkt->duration to non negative values

Michael Niedermayer git at videolan.org
Sat Jun 16 01:32:44 EEST 2018


ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Wed May 16 23:35:58 2018 +0200| [f36128518b5de543873df3eeeda460b8d54852fc] | committer: Michael Niedermayer

avformat/mov: Only set pkt->duration to non negative values

Reviewed-by: Sasi Inguva <isasi at google.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 8176799f31b23849382623f0f9001acc5edf7c76)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f36128518b5de543873df3eeeda460b8d54852fc
---

 libavformat/mov.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e1f1b36306..a44a90ca71 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7147,7 +7147,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
     } else {
         int64_t next_dts = (sc->current_sample < st->nb_index_entries) ?
             st->index_entries[sc->current_sample].timestamp : st->duration;
-        pkt->duration = next_dts - pkt->dts;
+
+        if (next_dts >= pkt->dts)
+            pkt->duration = next_dts - pkt->dts;
         pkt->pts = pkt->dts;
     }
     if (st->discard == AVDISCARD_ALL)



More information about the ffmpeg-cvslog mailing list