mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-27 15:34:49 +00:00
qtdemux: do_seek can never be called with a NULL event
This commit is contained in:
parent
83704e32e6
commit
f4f11530c2
1 changed files with 16 additions and 26 deletions
|
@ -1647,7 +1647,6 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
|
|||
GstEvent *flush_event;
|
||||
gboolean ret;
|
||||
|
||||
if (event) {
|
||||
GST_DEBUG_OBJECT (qtdemux, "doing seek with event");
|
||||
|
||||
gst_event_parse_seek (event, &rate, &format, &flags,
|
||||
|
@ -1661,10 +1660,6 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
|
|||
goto no_format;
|
||||
|
||||
GST_DEBUG_OBJECT (qtdemux, "seek format %s", gst_format_get_name (format));
|
||||
} else {
|
||||
GST_DEBUG_OBJECT (qtdemux, "doing seek without event");
|
||||
flags = 0;
|
||||
}
|
||||
|
||||
flush = flags & GST_SEEK_FLAG_FLUSH;
|
||||
|
||||
|
@ -1689,7 +1684,6 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
|
|||
* segment when we close the current segment. */
|
||||
memcpy (&seeksegment, &qtdemux->segment, sizeof (GstSegment));
|
||||
|
||||
if (event) {
|
||||
/* configure the segment with the seek variables */
|
||||
GST_DEBUG_OBJECT (qtdemux, "configuring seek");
|
||||
if (!gst_segment_do_seek (&seeksegment, rate, format, flags,
|
||||
|
@ -1700,10 +1694,6 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
|
|||
/* now do the seek */
|
||||
ret = gst_qtdemux_perform_seek (qtdemux, &seeksegment, seqnum, flags);
|
||||
}
|
||||
} else {
|
||||
/* now do the seek */
|
||||
ret = gst_qtdemux_perform_seek (qtdemux, &seeksegment, seqnum, flags);
|
||||
}
|
||||
|
||||
/* prepare for streaming again */
|
||||
if (flush) {
|
||||
|
|
Loading…
Reference in a new issue