[farsight2/master] rtpsubstream: Put codec/codecbin inside loop

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 22 10:06:08 PST 2009


---
 gst/fsrtpconference/fs-rtp-substream.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index 86c02bc..b8ba771 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -1287,8 +1287,6 @@ static void
 _rtpbin_pad_blocked_callback (GstPad *pad, gboolean blocked, gpointer user_data)
 {
   FsRtpSubStream *substream = user_data;
-  GstElement *codecbin = NULL;
-  FsCodec *codec = NULL;
   GError *error = NULL;
 
   if (fs_rtp_sub_stream_has_stopped_enter (substream))
@@ -1299,6 +1297,9 @@ _rtpbin_pad_blocked_callback (GstPad *pad, gboolean blocked, gpointer user_data)
 
   for (;;)
   {
+    GstElement *codecbin = NULL;
+    FsCodec *codec = NULL;
+
     g_signal_emit (substream, signals[GET_CODEC_BIN], 0,
         substream->priv->stream, substream->codec, &codec, &error, &codecbin);
 
@@ -1320,8 +1321,6 @@ _rtpbin_pad_blocked_callback (GstPad *pad, gboolean blocked, gpointer user_data)
 
  out:
 
-  fs_codec_destroy (codec);
-
   g_clear_error (&error);
 
   gst_pad_set_blocked_async (pad, FALSE, do_nothing_blocked_callback, NULL);
@@ -1344,6 +1343,7 @@ _rtpbin_pad_blocked_callback (GstPad *pad, gboolean blocked, gpointer user_data)
           FS_ERROR_CONSTRUCTION, str, error->message);
     g_free (str);
   }
+
   goto out;
 }
 
-- 
1.5.6.5




More information about the farsight-commits mailing list