summaryrefslogtreecommitdiff
path: root/ext/spc
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-25 13:22:43 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-25 13:22:43 +0100
commita2a430024136fd947637ff56a4fea6a2689ca59d (patch)
tree8cab3177242814f02b1e49a51d81b5f2f1660621 /ext/spc
parent071c6e8f15f2afff7ca4ce5934c3bae1d76aea95 (diff)
parent8fb0beaf00aeae2ef6081d08f0d74d6e655a53da (diff)
downloadgstreamer-plugins-bad-a2a430024136fd947637ff56a4fea6a2689ca59d.tar.gz
Merge branch 'master' into 0.11
Conflicts: configure.ac ext/kate/gstkateenc.c gst/colorspace/colorspace.c gst/mpegvideoparse/mpegvideoparse.c
Diffstat (limited to 'ext/spc')
-rw-r--r--ext/spc/gstspc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c
index 2c74a9c56..916718235 100644
--- a/ext/spc/gstspc.c
+++ b/ext/spc/gstspc.c
@@ -169,6 +169,8 @@ gst_spc_dec_dispose (GObject * object)
}
spc_tag_free (&spc->tag_info);
+
+ GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
}
static GstFlowReturn