From b8d64559d5dd5a47dc2897c82a61c02c4c5ca094 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 12 Oct 2012 20:08:08 +0200 Subject: [PATCH] movenc: fix timescale for timecode track regression since b02493e476 Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 2 +- tests/ref/lavf/mov | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 25dca338aea..8316c30d764 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3407,7 +3407,7 @@ static int mov_create_timecode_track(AVFormatContext *s, int index, int src_inde track->mode = mov->mode; track->tag = MKTAG('t','m','c','d'); track->src_track = src_index; - track->timescale = src_st->codec->time_base.den; + track->timescale = mov->tracks[src_index].timescale; if (tc.flags & AV_TIMECODE_FLAG_DROPFRAME) track->timecode_flags |= MOV_TIMECODE_FLAG_DROPFRAME; diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index d7ca02fbd10..d7cfbf85e91 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,7 +1,7 @@ fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov 367365 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -d3a85fc24ddd07e354645450073a30e3 *./tests/data/lavf/lavf.mov +d023fdd2149f75ef231180b6b0b0a988 *./tests/data/lavf/lavf.mov 358455 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 cbc587335946df1f08d838f48ef396f0 *./tests/data/lavf/lavf.mov -- 2.39.5