ext/mad/gstid3tag.c (gst_mad_id3_to_tag_list): unset GValues after calling transform.

Original commit message from CVS:
* ext/mad/gstid3tag.c (gst_mad_id3_to_tag_list): unset GValues after
calling transform.
(gst_id3_tag_do_typefind): Unref caps

* ext/mad/gstmad.c (gst_mad_check_caps_reset): Ditto

diff --git a/ChangeLog b/ChangeLog
index d01d39afa16df9271c08a44a3475c375218bf9bc..b1481918fb3b1494ae7a0758b672e2c528a946e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-15  Johan Dahlin  <johan@gnome.org>
+
+       * ext/mad/gstid3tag.c (gst_mad_id3_to_tag_list): unset GValues after
+       calling transform.
+       (gst_id3_tag_do_typefind): Unref caps
+
+       * ext/mad/gstmad.c (gst_mad_check_caps_reset): Ditto
+
 2005-11-15  Tim-Philipp Müller  <tim at centricular dot net>
 
        * ext/mpeg2dec/gstmpeg2dec.c: (handle_slice),

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index aad024e499547d0918f3184f3020a41c8b341e61..3d276865e53446cd3a577162ab3e02ab0a469856 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -693,6 +693,7 @@ gst_mad_id3_to_tag_list (const struct id3_tag * tag)
 
           g_value_init (&src, G_TYPE_STRING);
           g_value_set_string (&src, (const gchar *) utf8);
+
           g_value_init (&dest, tag_type);
           if (g_value_transform (&src, &dest)) {
             gst_tag_list_add_values (tag_list, GST_TAG_MERGE_APPEND,
@@ -701,6 +702,8 @@ gst_mad_id3_to_tag_list (const struct id3_tag * tag)
             GST_WARNING ("Failed to transform tag from string to type '%s'",
                 g_type_name (tag_type));
           }
+          g_value_unset (&src);
+          g_value_unset (&dest);
           break;
         }
       }
@@ -990,7 +993,10 @@ simple_find_suggest (gpointer data, guint probability, const GstCaps * caps)
   SimpleTypeFind *find = (SimpleTypeFind *) data;
 
   if (probability > find->best_probability) {
-    gst_caps_replace (&find->caps, gst_caps_copy (caps));
+    GstCaps *copy = gst_caps_copy (caps);
+
+    gst_caps_replace (&find->caps, copy);
+    gst_caps_unref (copy);
     find->best_probability = probability;
   }
 }

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 96a001312318e499fd1100cd4c4b5a3c4054c580..5403e1ea791d7a996195889c07c8e5414c63f498 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -1218,6 +1218,8 @@ gst_mad_check_caps_reset (GstMad * mad)
         "rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, nchannels, NULL);
 
     gst_pad_set_caps (mad->srcpad, caps);
+    gst_caps_unref (caps);
+
     mad->caps_set = TRUE;       /* set back to FALSE on discont */
     mad->channels = nchannels;
     mad->rate = rate;