diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-16 23:35:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-15 22:31:13 +0200 |
| commit | f36128518b5de543873df3eeeda460b8d54852fc (patch) | |
| tree | d9098378d66e032fd54123d978a4675914efb1e5 /libavformat/mov.c | |
| parent | 897524954be2eba39af71fbb9210236b337270a6 (diff) | |
| download | ffmpeg-f36128518b5de543873df3eeeda460b8d54852fc.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>
Diffstat (limited to 'libavformat/mov.c')
| -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 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) |