mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/matroska/matroska-mux.c: Update the track duration if the old one was invalid.

Browse source 
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.
This commit is contained in:
Sjoerd Simons 2008-05-08 08:15:34 +00:00 committed by Sebastian Dröge
parent 47056ccbcb
commit 1d00afde97
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 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): * gst/rtp/gstrtph264pay.c (gst_rtp_h264_pay_parse_sps_pps):

2
gst/matroska/matroska-mux.c
View file

@ -1972,7 +1972,7 @@ gst_matroska_mux_collected (GstCollectPads * pads, gpointer user_data)
else if (best->track->default_duration) else if (best->track->default_duration)
end_ts += 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; best->end_ts = end_ts;
if (G_UNLIKELY (best->start_ts == GST_CLOCK_TIME_NONE || if (G_UNLIKELY (best->start_ts == GST_CLOCK_TIME_NONE ||