summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJohn Stebbins <jstebbins@jetheaddev.com>2020-04-06 11:42:26 -0600
committerGyan Doshi <ffmpeg@gyani.pro>2020-04-11 12:03:58 +0530
commit99360990a916896421cb4173ba7bd8ce8878e4b5 (patch)
treecc77b06fef45ca4a8ef9f34601f5e4a90dccc19c /libavformat
parent49a32fa45c4e180c676a72142faff7e6b485c1cc (diff)
libavformat/mov: restore use of mfra time as dts
This was inadvertantly removed in 4a9d32baca Reviewed-by: Gyan Doshi <ffmpeg@gyani.pro>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c5
1 files changed, 5 insertions, 0 deletions
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;