From 37533d37ac7be3fe7eddb0ed2afc73a6331e76a0 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Thu, 17 Apr 2003 19:33:02 +0000
Subject: [PATCH] Fixed cueue creation/updates.

---
 mkvmerge.cpp   | 8 ++++----
 pr_generic.cpp | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mkvmerge.cpp b/mkvmerge.cpp
index e4f5d4f6c..88b7f7352 100644
--- a/mkvmerge.cpp
+++ b/mkvmerge.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: mkvmerge.cpp,v 1.33 2003/04/17 18:15:18 mosu Exp $
+    \version \$Id: mkvmerge.cpp,v 1.34 2003/04/17 19:33:02 mosu Exp $
     \brief command line parameter parsing, looping, output handling
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -455,9 +455,6 @@ static void parse_args(int argc, char **argv) {
   try {
     render_head(out);
 
-    kax_cues = new KaxCues();
-    kax_segment = new KaxSegment();
-
     kax_infos = &GetChild<KaxInfo>(*kax_segment);
     KaxTimecodeScale &time_scale = GetChild<KaxTimecodeScale>(*kax_infos);
     *(static_cast<EbmlUInteger *>(&time_scale)) = TIMECODE_SCALE;
@@ -760,6 +757,9 @@ int main(int argc, char **argv) {
 
   nice(2);
 
+  kax_segment = new KaxSegment();
+  kax_cues = new KaxCues();
+
   cluster_helper = new cluster_helper_c();
   cluster_helper->add_cluster(new KaxCluster());
 
diff --git a/pr_generic.cpp b/pr_generic.cpp
index 2e0282bf4..ea16f545a 100644
--- a/pr_generic.cpp
+++ b/pr_generic.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: pr_generic.cpp,v 1.16 2003/04/17 18:15:18 mosu Exp $
+    \version \$Id: pr_generic.cpp,v 1.17 2003/04/17 19:33:02 mosu Exp $
     \brief functions common for all readers/packetizers
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -238,6 +238,8 @@ int cluster_helper_c::render(IOCallback *out) {
     }
     if (new_group == NULL)
       new_group = last_block_group;
+    else
+      kax_cues->AddBlockGroup(*new_group);
     pack->group = new_group;
     last_block_group = new_group;
   }