Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:22:03 +0000 (00:22 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:22:03 +0000 (00:22 +0000)
Conflicts:
tools/gst-inspect.c

1  2 
gst/gststructure.c
libs/gst/base/gstbaseparse.c
tools/gst-inspect.c

Simple merge
Simple merge
@@@ -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)