gst-libs/gst/colorbalance/colorbalancechannel.c: Adding safety check in dispose method.

Original commit message from CVS:
2004-01-12  Julien MOUTTE <julien@moutte.net>

* gst-libs/gst/colorbalance/colorbalancechannel.c:
(gst_color_balance_channel_dispose): Adding safety check in dispose
method.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
(gst_xvimagesink_xcontext_clear),
(gst_xvimagesink_interface_supported),
(gst_xvimagesink_colorbalance_list_channels),
(gst_xvimagesink_colorbalance_set_value),
(gst_xvimagesink_colorbalance_get_value),
(gst_xvimagesink_colorbalance_init), (gst_xvimagesink_get_type):
Adding colorbalance interface support to set XV parameters such as
HUE, BRIGHTNESS, CONTRAST, SATURATION.
* sys/xvimage/xvimagesink.h: Adding the channels list for colorbalance
interface.

diff --git a/ChangeLog b/ChangeLog
index 7fa934a..8c6e86e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-01-12  Julien MOUTTE <julien@moutte.net>
+
+       * gst-libs/gst/colorbalance/colorbalancechannel.c:
+       (gst_color_balance_channel_dispose): Adding safety check in dispose
+       method.
+       * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
+       (gst_xvimagesink_xcontext_clear),
+       (gst_xvimagesink_interface_supported),
+       (gst_xvimagesink_colorbalance_list_channels),
+       (gst_xvimagesink_colorbalance_set_value),
+       (gst_xvimagesink_colorbalance_get_value),
+       (gst_xvimagesink_colorbalance_init), (gst_xvimagesink_get_type):
+       Adding colorbalance interface support to set XV parameters such as
+       HUE, BRIGHTNESS, CONTRAST, SATURATION.
+       * sys/xvimage/xvimagesink.h: Adding the channels list for colorbalance
+       interface.
+
 2004-01-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_get_type),

diff --git a/gst-libs/gst/colorbalance/colorbalancechannel.c b/gst-libs/gst/colorbalance/colorbalancechannel.c
index f871012..e8c6e87 100644 (file)
--- a/gst-libs/gst/colorbalance/colorbalancechannel.c
+++ b/gst-libs/gst/colorbalance/colorbalancechannel.c
@@ -96,7 +96,10 @@ gst_color_balance_channel_dispose (GObject *object)
 {
   GstColorBalanceChannel *channel = GST_COLOR_BALANCE_CHANNEL (object);
 
-  g_free (channel->label);
+  if (channel->label)
+    g_free (channel->label);
+  
+  channel->label = NULL;
 
   if (parent_class->dispose)
     parent_class->dispose (object);