From 1eeff88bae60d3f5f6751e9086b3a2bcd9d232e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Wed, 3 Jan 2007 17:00:08 +0000
Subject: [PATCH] ext/ffmpeg/gstffmpegenc.c: Turn dispose function into
 finalize function to avoid double-frees and potential crashes c...

Original commit message from CVS:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),
(gst_ffmpegenc_finalize):
Turn dispose function into finalize function to avoid double-frees
and potential crashes caused by them in some circumstances.
Fixes #392395.
---
 ChangeLog                 | 8 ++++++++
 ext/ffmpeg/gstffmpegenc.c | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68c5320c0e..110a9ebc71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),
+	(gst_ffmpegenc_finalize):
+	  Turn dispose function into finalize function to avoid double-frees
+	  and potential crashes caused by them in some circumstances.
+	  Fixes #392395.
+
 2006-12-21  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_smpfmt):
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index d2e9c36e92..ed01ca4e3a 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -95,7 +95,7 @@ static GHashTable *enc_global_plugins;
 static void gst_ffmpegenc_class_init (GstFFMpegEncClass * klass);
 static void gst_ffmpegenc_base_init (GstFFMpegEncClass * klass);
 static void gst_ffmpegenc_init (GstFFMpegEnc * ffmpegenc);
-static void gst_ffmpegenc_dispose (GObject * object);
+static void gst_ffmpegenc_finalize (GObject * object);
 
 static gboolean gst_ffmpegenc_setcaps (GstPad * pad, GstCaps * caps);
 static GstCaps *gst_ffmpegenc_getcaps (GstPad * pad);
@@ -208,7 +208,7 @@ gst_ffmpegenc_class_init (GstFFMpegEncClass * klass)
 
   gstelement_class->change_state = gst_ffmpegenc_change_state;
 
-  gobject_class->dispose = gst_ffmpegenc_dispose;
+  gobject_class->finalize = gst_ffmpegenc_finalize;
 }
 
 static void
@@ -259,7 +259,7 @@ gst_ffmpegenc_init (GstFFMpegEnc * ffmpegenc)
 }
 
 static void
-gst_ffmpegenc_dispose (GObject * object)
+gst_ffmpegenc_finalize (GObject * object)
 {
   GstFFMpegEnc *ffmpegenc = (GstFFMpegEnc *) object;
 
@@ -276,7 +276,7 @@ gst_ffmpegenc_dispose (GObject * object)
   g_queue_free (ffmpegenc->delay);
   g_free (ffmpegenc->filename);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static GstCaps *