# HG changeset patch
# User mosu
# Date 1052490065 0
# Node ID 04dacb55d55d1c2bbd67ce6082a3c1774ddf5f31
# Parent  6d46331e2d57e4897fe4778474c521537a368ae9
timecode scale value must be initialized before the duration is found. API change of libmatroska 0.4.2. Will not work with 0.4.1!

diff -r 6d46331e2d57 -r 04dacb55d55d libmpdemux/demux_mkv.cpp
--- a/libmpdemux/demux_mkv.cpp	Thu May 08 14:59:47 2003 +0000
+++ b/libmpdemux/demux_mkv.cpp	Fri May 09 14:21:05 2003 +0000
@@ -964,6 +964,8 @@
         // General info about this Matroska file
         mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment information...\n");
         
+        mkv_d->tc_scale = MKVD_TIMECODESCALE;
+
         l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el,
                                  0xFFFFFFFFL, true, 1);
         while (l2 != NULL) {
@@ -995,9 +997,6 @@
                                    0xFFFFFFFFL, true, 1);
         }
 
-        if (mkv_d->tc_scale == 0)
-          mkv_d->tc_scale = MKVD_TIMECODESCALE;
-
       } else if (EbmlId(*l1) == KaxTracks::ClassInfos.GlobalId) {
         // Yep, we've found our KaxTracks element. Now find all tracks
         // contained in this segment.
@@ -1665,8 +1664,8 @@
 
               if (EbmlId(*l3) == KaxBlock::ClassInfos.GlobalId) {
                 block = static_cast<KaxBlock *>(l3);
+                block->ReadData(es->I_O());
                 block->SetParent(*mkv_d->cluster);
-                block->ReadData(es->I_O());
                 delete_element = 0;
                 elements_found |= 1;