diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 13:22:43 +0100 |
| commit | a2a430024136fd947637ff56a4fea6a2689ca59d (patch) | |
| tree | 8cab3177242814f02b1e49a51d81b5f2f1660621 /gst/siren | |
| parent | 071c6e8f15f2afff7ca4ce5934c3bae1d76aea95 (diff) | |
| parent | 8fb0beaf00aeae2ef6081d08f0d74d6e655a53da (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
Diffstat (limited to 'gst/siren')
| -rw-r--r-- | gst/siren/gstsirenenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/siren/gstsirenenc.c b/gst/siren/gstsirenenc.c index 561d2689d..a78cdb8bc 100644 --- a/gst/siren/gstsirenenc.c +++ b/gst/siren/gstsirenenc.c @@ -158,7 +158,7 @@ gst_siren_enc_finalize (GObject * object) Siren7_CloseEncoder (enc->encoder); g_object_unref (enc->adapter); - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (parent_class)->finalize (object); } static gboolean |