[0.11] gst-plugins-good: flvmux: Update for new collectpads2 event handling API

Sebastian Dröge slomo at kemper.freedesktop.org
Thu Jan 26 01:46:11 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: 76a22a6ebbe6bb1f57773867176ab0c97c6c6781
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=76a22a6ebbe6bb1f57773867176ab0c97c6c6781

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Jan 26 10:28:51 2012 +0100

flvmux: Update for new collectpads2 event handling API

---

 gst/flv/gstflvmux.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index 594c334..6aecb99 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -305,7 +305,6 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
         ret = gst_flv_mux_audio_pad_setcaps (data->pad, caps);
       }
       /* and eat */
-      ret = FALSE;
       gst_event_unref (event);
       break;
     }
@@ -317,13 +316,20 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
       gst_event_parse_tag (event, &list);
       gst_tag_setter_merge_tags (setter, list, mode);
       mux->new_tags = TRUE;
+      ret = TRUE;
+      gst_event_unref (event);
       break;
     }
+    case GST_EVENT_EOS:
+    case GST_EVENT_SEGMENT:
+      gst_event_unref (event);
+      ret = TRUE;
+      break;
     default:
+      ret = gst_pad_event_default (data->pad, GST_OBJECT (mux), event);
       break;
   }
 
-  /* now GstCollectPads2 can take care of the rest, e.g. EOS */
   return ret;
 }
 



More information about the gstreamer-commits mailing list