[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.cpp,1.22,1.23

[Moritz Bunkus CVS]

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

Modified Files:
	demux_mkv.cpp 
Log Message:
Big reorganization. Relies on libmatroska's Read() function and then processes units in memory. Also some fixes for handling of global elements which re-enable playback of files created with the latest VDubMod.

Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_mkv.cpp	17 Jul 2003 15:08:34 -0000	1.22
+++ demux_mkv.cpp	17 Aug 2003 09:26:01 -0000	1.23
@@ -47,11 +47,13 @@
 #include <matroska/KaxTracks.h>
 #include <matroska/KaxTrackAudio.h>
 #include <matroska/KaxTrackVideo.h>
+#include <matroska/KaxTrackEntryData.h>
 #include <matroska/FileKax.h>
 
 #include "matroska.h"
 
-using namespace LIBMATROSKA_NAMESPACE;
+using namespace libebml;
+using namespace libmatroska;
[...1403 lines suppressed...]
         l1 = l2;
+        continue;
+
+      } else if (upper_lvl_el < 0) {
+        upper_lvl_el++;
+        if (upper_lvl_el < 0)
+          break;
+
       }
+
+      if (exit_loop)
+        break;
+
+      l1->SkipData(*es, l1->Generic().Context);
+      delete l1;
+      l1 = es->FindNextElement(l0->Generic().Context, upper_lvl_el,
+                               0xFFFFFFFFL, true);
 
     } // while (l1 != NULL)
   } catch (exception ex) {