diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2008-05-08 08:15:34 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-05-08 08:15:34 +0000 |
| commit | 1d00afde9753aefe00d07bf846aa55feb79249bd (patch) | |
| tree | cf3509eacf6cdc6d3157900967f416049c67854f | |
| parent | 47056ccbcb9ead26540238c269ed3cf175cb4957 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -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 098b2fc0..dd3fbd32 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 || |