From 68a8b4c2a5b7e4dad2afa2ed75ab543506f3203b Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 16 Apr 2009 22:27:25 +0200 Subject: [PATCH] Fix for outputting timecodes in summary mode. 1. The formatted timecodes for SimpleBlock elements were too small by a factor of 1000000. 2. Output all timecodes with three decimal digits. --- ChangeLog | 6 ++++++ src/info/mkvinfo.cpp | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d99a9975..146ba1163 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-16 Moritz Bunkus + + * mkvinfo: bug fix: Timecodes of SimpleBlock elements that were + output formatted in summary mode were too small by a factor of + 1000000. + 2009-04-15 Moritz Bunkus * mkvmerge: bug fix: The duration of subtitle frames was diff --git a/src/info/mkvinfo.cpp b/src/info/mkvinfo.cpp index d2790d14c..af4cac564 100644 --- a/src/info/mkvinfo.cpp +++ b/src/info/mkvinfo.cpp @@ -1286,7 +1286,7 @@ def_handle2(block_group, % block.TrackNum() % block.NumberFrames() % ((float)block.GlobalTimecode() / 1000000000.0) - % format_timecode(block.GlobalTimecode())); + % format_timecode(block.GlobalTimecode(), 3)); lf_timecode = block.GlobalTimecode() / 1000000; lf_tnum = block.TrackNum(); @@ -1486,7 +1486,7 @@ def_handle2(simple_block, % block.TrackNum() % block.NumberFrames() % ((float)timecode / 1000.0) - % format_timecode(block.GlobalTimecode())); + % format_timecode(block.GlobalTimecode(), 3)); int i; for (i = 0; i < (int)block.NumberFrames(); i++) { @@ -1515,7 +1515,7 @@ def_handle2(simple_block, % (block.IsKeyframe() ? 'I' : block.IsDiscardable() ? 'B' : 'P') % block.TrackNum() % timecode - % format_timecode(timecode) + % format_timecode(block.GlobalTimecode(), 3) % frame_sizes[fidx] % frame_adlers[fidx]);