diff options
author | Dale Curtis <dalecurtis@chromium.org> | 2020-05-15 00:38:07 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 02:47:56 +0300 |
commit | 361416218a2d3b4d83209b4ca5e36419cfd5eeb0 (patch) | |
tree | adee7bd927ecfc441b2d86371399b05d76a0bbf7 /libavformat/mov.c | |
parent | 500965b7eeeab9d0dd08c38bb1f52666fad6d55b (diff) |
avformat/mov: Check if DTS is AV_NOPTS_VALUE in mov_find_next_sample().
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bf446711bc8b7f316771870b8d4dc4dd65f5d94b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index da0d90733f..f363ea7b10 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7624,7 +7624,7 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) av_log(s, AV_LOG_TRACE, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts); if (!sample || (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && current_sample->pos < sample->pos) || ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && - ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && + ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && dts != AV_NOPTS_VALUE && ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) || (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) { sample = current_sample; |