[0.11] gst-plugins-good: avimux: 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: 934cd01480ddc847b1d6b7babdf94be100d2e564
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=934cd01480ddc847b1d6b7babdf94be100d2e564

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

avimux: Update for new collectpads2 event handling API

---

 gst/avi/gstavimux.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index a2b2efb..c2fbeed 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1851,6 +1851,7 @@ gst_avi_mux_handle_event (GstCollectPads2 * pads, GstCollectData2 * data,
       } else {
         ret = gst_avi_mux_audsink_set_caps (GST_PAD (avipad), caps);
       }
+      gst_event_unref (event);
       break;
     }
     case GST_EVENT_TAG:{
@@ -1860,13 +1861,20 @@ gst_avi_mux_handle_event (GstCollectPads2 * pads, GstCollectData2 * data,
 
       gst_event_parse_tag (event, &list);
       gst_tag_setter_merge_tags (setter, list, mode);
+      gst_event_unref (event);
+      ret = TRUE;
       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 (avimux), event);
       break;
   }
 
-  /* now GstCollectPads2 can take care of the rest, e.g. EOS */
   return ret;
 }
 



More information about the gstreamer-commits mailing list