From 1d00afde9753aefe00d07bf846aa55feb79249bd Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
Date: Thu, 8 May 2008 08:15:34 +0000
Subject: [PATCH] gst/matroska/matroska-mux.c: Update the track duration if the
 old one was invalid.

Original commit message from CVS:
Patch by: Sjoerd Simons <sjoerd at luon dot net>
* gst/matroska/matroska-mux.c: (gst_matroska_mux_collected):
Update the track duration if the old one was invalid.
Fixes bug #532117.
---
 ChangeLog                   | 8 ++++++++
 gst/matroska/matroska-mux.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 21dfe2f995..2a50ccf04d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-08  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Sjoerd Simons <sjoerd at luon dot net>
+
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_collected):
+	Update the track duration if the old one was invalid.
+	Fixes bug #532117.
+
 2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 
 	* gst/rtp/gstrtph264pay.c (gst_rtp_h264_pay_parse_sps_pps):
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 098b2fc022..dd3fbd32fd 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1972,7 +1972,7 @@ gst_matroska_mux_collected (GstCollectPads * pads, gpointer user_data)
       else if (best->track->default_duration)
         end_ts += best->track->default_duration;
 
-      if (end_ts > best->end_ts)
+      if (!GST_CLOCK_TIME_IS_VALID (best->end_ts) || end_ts > best->end_ts)
         best->end_ts = end_ts;
 
       if (G_UNLIKELY (best->start_ts == GST_CLOCK_TIME_NONE ||