Commit 1d00afde authored by Sjoerd Simons's avatar Sjoerd Simons Committed by Sebastian Dröge
Browse files

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.
parent 47056ccb
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):
......
......@@ -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 ||
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment