ext/faad/gstfaad.c: Don't take STREAM_LOCK in sink event handlers any more.

Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_event):
Don't take STREAM_LOCK in sink event handlers any more.

diff --git a/ChangeLog b/ChangeLog
index aa2c7ce2ba657f63a59aa32d050ab1fb9a23d454..9a73fff017dda60fb8d0175db8c0d5b52733fa0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-21  Michael Smith <msmith@fluendo.com>
+
+       * ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_event):
+         Don't take STREAM_LOCK in sink event handlers any more.
+
 2005-11-21  Wim Taymans  <wim@fluendo.com>
 
        * ext/faac/gstfaac.c: (gst_faac_sink_event):

diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index e06847924cac471e328a84e7c83615cf9542293d..85e20ce798e527c218af93b2c432eaa7023c3b28 100644 (file)
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -37,8 +37,8 @@
  * but not all, hence this Truly Evil Hack. This hack will need updating if
  * upstream ever releases something with the new API.
  */
-#define faacDecInit faadDecInit_no_definition
-#define faacDecInit2 faadDecInit2_no_definition
+#define faacDecInit faacDecInit_no_definition
+#define faacDecInit2 faacDecInit2_no_definition
 #include "gstfaad.h"
 #undef faacDecInit
 #undef faacDecInit2
@@ -647,13 +647,11 @@ gst_faad_event (GstPad * pad, GstEvent * event)
    *  (when our newsegment was in BYTES) */
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
-      GST_STREAM_LOCK (pad);
       if (faad->tempbuf != NULL) {
         gst_buffer_unref (faad->tempbuf);
         faad->tempbuf = NULL;
       }
       res = gst_pad_push_event (faad->srcpad, event);
-      GST_STREAM_UNLOCK (pad);
       break;
     case GST_EVENT_NEWSEGMENT:
     {
@@ -696,9 +694,7 @@ gst_faad_event (GstPad * pad, GstEvent * event)
             GST_TIME_ARGS (new_end));
       }
 
-      GST_STREAM_LOCK (pad);
       res = gst_pad_push_event (faad->srcpad, event);
-      GST_STREAM_UNLOCK (pad);
       break;
     }
     default: