diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-15 14:57:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-15 15:09:46 +0200 |
| commit | 5c7a62aef59e4e7b92078a4c1f5f93ca5c8021ff (patch) | |
| tree | 9ffa26caf448d301975b7465e37b8478f28633f8 | |
| parent | 5bac83dae84ae7693acb5a4d09b555729771f11c (diff) | |
movenc: fix tmcd parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/movenc.c | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/mov | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8316c30d76..0b0bf83bb5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1146,7 +1146,7 @@ static int mov_write_video_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_tmcd_tag(AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); - int frame_duration = track->enc->time_base.num; + int frame_duration = av_rescale(track->timescale, track->enc->time_base.num, track->enc->time_base.den); int nb_frames = (track->timescale + frame_duration/2) / frame_duration; avio_wb32(pb, 0); /* size */ diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index d7cfbf85e9..4554ea65d9 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 -d023fdd2149f75ef231180b6b0b0a988 *./tests/data/lavf/lavf.mov +72eac0051107a16e41d5263dab640f26 *./tests/data/lavf/lavf.mov 358455 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 cbc587335946df1f08d838f48ef396f0 *./tests/data/lavf/lavf.mov |