mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-27 01:28:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "queue: Illegal memory access of sink event"

Browse source 
This reverts commit 78614c505a.

The code it was fixing does not have any effect anyway and will be removed in
the next commit.
This commit is contained in:
Sebastian Dröge 2015-12-14 11:16:50 +01:00
parent 78614c505a
commit 0636fe1391
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/elements/gstqueue.c
View file

@ -902,11 +902,10 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
{ {
gboolean ret = TRUE; gboolean ret = TRUE;
GstQueue *queue; GstQueue *queue;
GstEventType event_type = GST_EVENT_TYPE (event);
queue = GST_QUEUE (parent); queue = GST_QUEUE (parent);
switch (event_type) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
STATUS (queue, pad, "received flush start event"); STATUS (queue, pad, "received flush start event");
/* forward event */ /* forward event */
@ -961,7 +960,7 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
if (!GST_EVENT_IS_STICKY (event)) { if (!GST_EVENT_IS_STICKY (event)) {
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
goto out_flow_error; goto out_flow_error;
} else if (event_type == GST_EVENT_EOS) { } else if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
if (queue->srcresult == GST_FLOW_NOT_LINKED if (queue->srcresult == GST_FLOW_NOT_LINKED
|| queue->srcresult < GST_FLOW_EOS) { || queue->srcresult < GST_FLOW_EOS) {
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
@ -987,7 +986,7 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
break; break;
} }
if (ret == FALSE) { if (ret == FALSE) {
if (event_type == GST_EVENT_CAPS) if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS)
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }