From 99360990a916896421cb4173ba7bd8ce8878e4b5 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Mon, 6 Apr 2020 11:42:26 -0600 Subject: [PATCH] libavformat/mov: restore use of mfra time as dts This was inadvertantly removed in 4a9d32baca Reviewed-by: Gyan Doshi --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0c4e468dd4..32f51e6a4c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4805,6 +4805,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) pts = frag_stream_info->first_tfra_pts; av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 ", using it for pts\n", pts); + } else if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE && + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { + dts = frag_stream_info->first_tfra_pts; + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 + ", using it for dts\n", pts); } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) { // FIXME: sidx earliest_presentation_time is *PTS*, s.b. // pts = frag_stream_info->sidx_pts;