From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Fri, 13 Jan 2012 00:22:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: RELEASE-0.11.2~191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66d19b65fb6eee8283a6c2ac742be251f66d631c;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	tools/gst-inspect.c
---

66d19b65fb6eee8283a6c2ac742be251f66d631c
diff --cc tools/gst-inspect.c
index b81c2e6,165ad3f..37684cf
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@@ -1241,11 -1285,9 +1241,12 @@@ print_plugin_features (GstPlugin * plug
        num_other++;
      }
      num_features++;
+     gst_object_unref (feature);
      features = g_list_next (features);
    }
 +
 +  gst_plugin_feature_list_free (origlist);
 +
    n_print ("\n");
    n_print ("  %d features:\n", num_features);
    if (num_elements > 0)