diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-16 23:35:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 19:45:47 +0200 |
| commit | 39723d1ccbb2b0d11ed81be742d90232fcd788ef (patch) | |
| tree | f2a5ab3bfd48050d0993ba8d9a2fe1164dd8100d | |
| parent | 35cd7417f9ffcad57783cd479a6e6cc4543cb929 (diff) | |
| download | ffmpeg-39723d1ccbb2b0d11ed81be742d90232fcd788ef.tar.gz | |
avformat/mov: Only set pkt->duration to non negative values
Reviewed-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8176799f31b23849382623f0f9001acc5edf7c76)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 336ccff618..672a218bb0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5876,7 +5876,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) |