X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fvideomixer%2Fvideomixer2.c;h=e559221ffcac0c6e879e31cc63b1b68debab6a2a;hb=04b4d30f2cf7f8196703e14647cbb88b7ec1ad37;hp=6a49f933654602fe3df58420aab306e96e1e95f0;hpb=531142c7e4c1947e92b4cee667efce612f44e433;p=platform%2Fupstream%2Fgst-plugins-good.git

diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 6a49f93..e559221 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -1631,7 +1631,6 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
   GST_DEBUG_OBJECT (pad, "Got %s event on pad %s:%s",
       GST_EVENT_TYPE_NAME (event), GST_DEBUG_PAD_NAME (pad));
 
-  /* return FALSE => event will be forwarded */
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_CAPS:
     {
@@ -1642,6 +1641,7 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
           gst_videomixer2_pad_sink_setcaps (GST_PAD (pad), GST_OBJECT (mix),
           caps);
       gst_event_unref (event);
+      event = NULL;
       break;
     }
     case GST_EVENT_SEGMENT:{
@@ -1649,9 +1649,6 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
       gst_event_copy_segment (event, &seg);
 
       g_assert (seg.format == GST_FORMAT_TIME);
-      /* eat SEGMENT events */
-      ret = TRUE;
-      gst_event_unref (event);
       break;
     }
     case GST_EVENT_FLUSH_STOP:
@@ -1666,18 +1663,14 @@ gst_videomixer2_sink_event (GstCollectPads2 * pads, GstCollectData2 * cdata,
       mix->segment.position = -1;
       mix->ts_offset = 0;
       mix->nframes = 0;
-
-      ret = gst_pad_event_default (cdata->pad, GST_OBJECT (mix), event);
-      break;
-    case GST_EVENT_EOS:
-      gst_event_unref (event);
-      ret = TRUE;
       break;
     default:
-      ret = gst_pad_event_default (cdata->pad, GST_OBJECT (mix), event);
       break;
   }
 
+  if (event != NULL)
+    return gst_collect_pads2_event_default (pads, cdata, event, FALSE);
+
   return ret;
 }