gdkpixbuf: re-enable already-ported gdkpixbufsink

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index d82b428..ed6cec6 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -5,14 +5,11 @@ plugin_LTLIBRARIES = libgstgdkpixbuf.la
 # gstgdkanimation.[ch] - GdkPixbuf animations decode everything from the start,
 # which means it's easy to make us go OOM with manipulated input, disabled
 
-# TO PORT:
-# gstgdkpixbufsink.c gstgdkpixbufoverlay.c
-# gstgdkpixbufsink.h gstgdkpixbufoverlay.h
-
 libgstgdkpixbuf_la_SOURCES = \
+       gstgdkpixbufdec.c \
        gstgdkpixbufoverlay.c \
        gstgdkpixbufplugin.c \
-       gstgdkpixbufdec.c
+       gstgdkpixbufsink.c
 libgstgdkpixbuf_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_CONTROLLER_CFLAGS) \
@@ -27,5 +24,6 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
-    gstgdkpixbufdec.h \
-    gstgdkpixbufoverlay.h
+       gstgdkpixbufdec.h \
+       gstgdkpixbufoverlay.h \
+       gstgdkpixbufsink.h

diff --git a/ext/gdk_pixbuf/gstgdkpixbufplugin.c b/ext/gdk_pixbuf/gstgdkpixbufplugin.c
index 93790bc..e589efa 100644 (file)
--- a/ext/gdk_pixbuf/gstgdkpixbufplugin.c
+++ b/ext/gdk_pixbuf/gstgdkpixbufplugin.c
@@ -26,10 +26,7 @@
 
 #include "gstgdkpixbufdec.h"
 #include "gstgdkpixbufoverlay.h"
-
-#if 0
 #include "gstgdkpixbufsink.h"
-#endif
 
 
 #if 0
@@ -97,18 +94,13 @@ plugin_init (GstPlugin * plugin)
           GST_TYPE_GDK_PIXBUF_OVERLAY))
     return FALSE;
 
-#if 0
   if (!gst_element_register (plugin, "gdkpixbufsink", GST_RANK_NONE,
           GST_TYPE_GDK_PIXBUF_SINK))
     return FALSE;
-#endif
 
   return TRUE;
 }
 
-
-/* this is the structure that gst-register looks for
- * so keep the name plugin_desc, or you cannot get your plug-in registered */
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     gdkpixbuf,