Browse Source

avformat/mov: improve timecode calculation

Fixes timecode calculation for NTSC frame rates.
Fixes ticket #5978.
tags/n4.3
Paul B Mahol 5 years ago
parent
commit
428b4aacb1
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      libavformat/mov.c
  2. +1
    -1
      tests/ref/fate/copy-trac236

+ 2
- 2
libavformat/mov.c View File

@@ -2304,8 +2304,8 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb,
int val; int val;
val = AV_RB32(st->codecpar->extradata + 4); val = AV_RB32(st->codecpar->extradata + 4);
tmcd_ctx->tmcd_flags = val; 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 #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
st->codec->time_base = av_inv_q(st->avg_frame_rate); st->codec->time_base = av_inv_q(st->avg_frame_rate);


+ 1
- 1
tests/ref/fate/copy-trac236 View File

@@ -1,4 +1,4 @@
959a4d78c6c11936e361fc3101a013eb *tests/data/fate/copy-trac236.mov
984a33c6292e3d35e2cfdfbf66d8e82b *tests/data/fate/copy-trac236.mov
630860 tests/data/fate/copy-trac236.mov 630860 tests/data/fate/copy-trac236.mov
#tb 0: 100/2997 #tb 0: 100/2997
#media_type 0: video #media_type 0: video


Loading…
Cancel
Save