From 881fcc40aad27d646a9b5866569ed8ca0e78777b Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 22 Aug 2019 18:14:15 +0200 Subject: [PATCH] avformat/mov: improve timecode calculation Fixes timecode calculation for NTSC frame rates. Fixes ticket #5978. --- libavformat/mov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 24de5429d1..8fffc51fcb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2303,8 +2303,8 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, int val; val = AV_RB32(st->codecpar->extradata + 4); tmcd_ctx->tmcd_flags = val; - st->avg_frame_rate.num = st->codecpar->extradata[16]; /* number of frame */ - st->avg_frame_rate.den = 1; + st->avg_frame_rate.num = AV_RB32(st->codecpar->extradata + 8); /* timescale */ + st->avg_frame_rate.den = AV_RB32(st->codecpar->extradata + 12); /* frameDuration */ #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS st->codec->time_base = av_inv_q(st->avg_frame_rate); -- 2.22.0