[0.11] gst-plugins-base: playsink: Only unref ts_offset elements if they' re not NULL

Wim Taymans wtay at kemper.freedesktop.org
Tue Sep 6 06:27:07 PDT 2011


Module: gst-plugins-base
Branch: 0.11
Commit: 49b301bcd6df7a210582db836c0574a40acc27ad
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=49b301bcd6df7a210582db836c0574a40acc27ad

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed Aug 31 14:45:08 2011 +0200

playsink: Only unref ts_offset elements if they're not NULL

---

 gst/playback/gstplaysink.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index cd92c33..35e31d6 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -2311,7 +2311,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
 
       add_chain (GST_PLAY_CHAIN (playsink->videochain), FALSE);
       activate_chain (GST_PLAY_CHAIN (playsink->videochain), FALSE);
-      g_object_unref (playsink->videochain->ts_offset);
+      if (playsink->videochain->ts_offset)
+        g_object_unref (playsink->videochain->ts_offset);
       playsink->videochain->ts_offset = NULL;
     }
 
@@ -2365,7 +2366,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
         disconnect_chain (playsink->audiochain, playsink);
         playsink->audiochain->volume = NULL;
         playsink->audiochain->mute = NULL;
-        g_object_unref (playsink->audiochain->ts_offset);
+        if (playsink->audiochain->ts_offset)
+          g_object_unref (playsink->audiochain->ts_offset);
         playsink->audiochain->ts_offset = NULL;
         free_chain ((GstPlayChain *) playsink->audiochain);
         playsink->audiochain = NULL;
@@ -2434,7 +2436,8 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
         disconnect_chain (playsink->audiochain, playsink);
         playsink->audiochain->volume = NULL;
         playsink->audiochain->mute = NULL;
-        g_object_unref (playsink->audiochain->ts_offset);
+        if (playsink->audiochain->ts_offset)
+          g_object_unref (playsink->audiochain->ts_offset);
         playsink->audiochain->ts_offset = NULL;
       }
       add_chain (GST_PLAY_CHAIN (playsink->audiochain), FALSE);
@@ -3441,7 +3444,8 @@ gst_play_sink_change_state (GstElement * element, GstStateChange transition)
         disconnect_chain (playsink->audiochain, playsink);
         playsink->audiochain->volume = NULL;
         playsink->audiochain->mute = NULL;
-        g_object_unref (playsink->audiochain->ts_offset);
+        if (playsink->audiochain->ts_offset)
+          g_object_unref (playsink->audiochain->ts_offset);
         playsink->audiochain->ts_offset = NULL;
       }
       ret = GST_STATE_CHANGE_SUCCESS;



More information about the gstreamer-commits mailing list