From 11aa9388e76cdad3aeda3da9ff284e0a535f881a Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Sat, 16 Sep 2006 22:19:40 +0000
Subject: [PATCH] ext/ffmpeg/: More G_OBJECT macro fixing.

Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c:
* ext/ffmpeg/gstffmpegdeinterlace.c:
* ext/ffmpeg/gstffmpegenc.h:
* ext/ffmpeg/gstffmpegmux.c:
* ext/ffmpeg/gstffmpegscale.c:
More G_OBJECT macro fixing.
---
 ChangeLog                         | 9 +++++++++
 common                            | 2 +-
 ext/ffmpeg/gstffmpegdec.c         | 2 +-
 ext/ffmpeg/gstffmpegdeinterlace.c | 2 +-
 ext/ffmpeg/gstffmpegenc.h         | 2 +-
 ext/ffmpeg/gstffmpegmux.c         | 2 +-
 ext/ffmpeg/gstffmpegscale.c       | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3dbcc80..3821bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-17  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/ffmpeg/gstffmpegdec.c:
+	* ext/ffmpeg/gstffmpegdeinterlace.c:
+	* ext/ffmpeg/gstffmpegenc.h:
+	* ext/ffmpeg/gstffmpegmux.c:
+	* ext/ffmpeg/gstffmpegscale.c:
+	  More G_OBJECT macro fixing.
+
 2006-09-13  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
diff --git a/common b/common
index d287125..a8c15b7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit d287125f93da692bc25d53b0b7b0e2f90424a212
+Subproject commit a8c15b7a2c75fc2bd83850cb17cb05a1ee84ecaf
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index b389afe..668ef5a 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -115,7 +115,7 @@ struct _GstFFMpegDecClassParams
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGDEC,GstFFMpegDecClass))
 #define GST_IS_FFMPEGDEC(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGDEC))
-#define GST_IS_FFMPEGDEC_CLASS(obj) \
+#define GST_IS_FFMPEGDEC_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGDEC))
 
 enum
diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/ffmpeg/gstffmpegdeinterlace.c
index b33a839..755b449 100644
--- a/ext/ffmpeg/gstffmpegdeinterlace.c
+++ b/ext/ffmpeg/gstffmpegdeinterlace.c
@@ -62,7 +62,7 @@ typedef struct _GstFFMpegDeinterlaceClass
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGDEINTERLACE,GstFFMpegDeinterlace))
 #define GST_IS_FFMPEGDEINTERLACE(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGDEINTERLACE))
-#define GST_IS_FFMPEGDEINTERLACE_CLASS(obj) \
+#define GST_IS_FFMPEGDEINTERLACE_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGDEINTERLACE))
 
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
diff --git a/ext/ffmpeg/gstffmpegenc.h b/ext/ffmpeg/gstffmpegenc.h
index b075378..4c3c10e 100644
--- a/ext/ffmpeg/gstffmpegenc.h
+++ b/ext/ffmpeg/gstffmpegenc.h
@@ -93,7 +93,7 @@ typedef struct
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGENC,GstFFMpegEncClass))
 #define GST_IS_FFMPEGENC(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGENC))
-#define GST_IS_FFMPEGENC_CLASS(obj) \
+#define GST_IS_FFMPEGENC_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGENC))
 
 G_END_DECLS
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 4e5fa1c..603f249 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -87,7 +87,7 @@ struct _GstFFMpegMuxClass
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGMUX,GstFFMpegMuxClass))
 #define GST_IS_FFMPEGMUX(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGMUX))
-#define GST_IS_FFMPEGMUX_CLASS(obj) \
+#define GST_IS_FFMPEGMUX_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGMUX))
 
 enum
diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c
index b7974b9..0868907 100644
--- a/ext/ffmpeg/gstffmpegscale.c
+++ b/ext/ffmpeg/gstffmpegscale.c
@@ -64,7 +64,7 @@ typedef struct _GstFFMpegScaleClass
 	(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FFMPEGSCALE,GstFFMpegScaleClass))
 #define GST_IS_FFMPEGSCALE(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FFMPEGSCALE))
-#define GST_IS_FFMPEGSCALE_CLASS(obj) \
+#define GST_IS_FFMPEGSCALE_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FFMPEGSCALE))
 
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
-- 
2.7.4