[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.cpp,1.8,1.9

[Moritz Bunkus CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv14274

Modified Files:
	demux_mkv.cpp 
Log Message:
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!

Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- demux_mkv.cpp	6 May 2003 20:40:24 -0000	1.8
+++ demux_mkv.cpp	9 May 2003 14:21:05 -0000	1.9
@@ -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->SetParent(*mkv_d->cluster);
                 block->ReadData(es->I_O());
+                block->SetParent(*mkv_d->cluster);
                 delete_element = 0;
                 elements_found |= 1;