diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-04-18 17:29:42 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-04-18 17:29:42 +0000 |
| commit | a2bcaaa54c94df41e36e975e13d676e5adb2105c (patch) | |
| tree | 0811020c574f86d1d77f0c2f67821acef427ff7c /ext/gdk_pixbuf | |
| parent | 1c8e824c4eccf22c0146c01a27af8dd7596fc2b1 (diff) | |
ext/gdk_pixbuf/gstgdkpixbuf.c: No need to special-case for Gdk-2.0 any longer, we require
Original commit message from CVS:
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_get_capslist),
(gst_gdk_pixbuf_set_property), (gst_gdk_pixbuf_get_property):
No need to special-case for Gdk-2.0 any longer, we require
Gdk 2.2 or newer; minor clean-ups.
Diffstat (limited to 'ext/gdk_pixbuf')
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbuf.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index 82c2de24..a02929f0 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -39,17 +39,10 @@ GST_ELEMENT_DETAILS ("GdkPixbuf image decoder", "Decodes images in a video stream using GdkPixbuf", "David A. Schleef <ds@schleef.org>, Renato Filho <renato.filho@indt.org.br>"); -/* Filter signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - enum { ARG_0, - ARG_SILENT + ARG_SILENT /* FIXME 0.11: remove */ }; static GstStaticPadTemplate gst_gdk_pixbuf_sink_template = @@ -127,20 +120,6 @@ GST_BOILERPLATE (GstGdkPixbuf, gst_gdk_pixbuf, GstElement, GST_TYPE_ELEMENT) return TRUE; } - -#if GDK_PIXBUF_MAJOR == 2 && GDK_PIXBUF_MINOR < 2 -/* gdk-pixbuf prior to 2.2 didn't have gdk_pixbuf_get_formats(). - * These are just the formats that gdk-pixbuf is known to support. - * But maybe not -- it may have been compiled without an external - * library. */ - -static GstCaps * -gst_gdk_pixbuf_get_capslist (void) -{ - return gst_caps_copy (gst_static_caps_get (&gst_gdk_pixbuf_sink_template. - static_caps)); -} -#else static GstCaps * gst_gdk_pixbuf_get_capslist (void) { @@ -173,7 +152,6 @@ gst_gdk_pixbuf_get_capslist (void) gst_caps_unref (capslist); return return_caps; } -#endif static GstCaps * gst_gdk_pixbuf_sink_getcaps (GstPad * pad) @@ -414,7 +392,6 @@ gst_gdk_pixbuf_set_property (GObject * object, guint prop_id, { GstGdkPixbuf *filter; - g_return_if_fail (GST_IS_GDK_PIXBUF (object)); filter = GST_GDK_PIXBUF (object); switch (prop_id) { @@ -433,7 +410,6 @@ gst_gdk_pixbuf_get_property (GObject * object, guint prop_id, { GstGdkPixbuf *filter; - g_return_if_fail (GST_IS_GDK_PIXBUF (object)); filter = GST_GDK_PIXBUF (object); switch (prop_id) { |