4 files changed, 2 insertions, 19 deletions
diff --git a/gst/playondemand/Makefile.am b/gst/playondemand/Makefile.am
index a9894c4b..1cfbe766 100644
--- a/gst/playondemand/Makefile.am
+++ b/gst/playondemand/Makefile.am
@@ -15,5 +15,5 @@ endif
 demo_mp3_SOURCES = demo-mp3.c gstplayondemand.h
 ## putting GTK_CFLAGS first fixes a weird compilation error with GTK and XML
 demo_mp3_CFLAGS  = $(GTK_CFLAGS) $(GST_CFLAGS)
-demo_mp3_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) libgstplayondemand.la
+demo_mp3_LDFLAGS = $(GST_LIBS) $(GTK_LIBS)
 demo_mp3_DEPENDENCIES = libgstplayondemand.la
diff --git a/gst/playondemand/filter.func b/gst/playondemand/filter.func
index 3f2755a0..cded073e 100644
--- a/gst/playondemand/filter.func
+++ b/gst/playondemand/filter.func
@@ -46,7 +46,7 @@ do {
 
     out = GST_BUFFER (in);
   } else {
-    out = gst_buffer_new_from_pool(filter->bufpool, 0, 0);
+    out = gst_buffer_new_and_alloc (GST_POD_BUFPOOL_SIZE);
   }
 
   in = NULL;
diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c
index 3f01165a..0dec3835 100644
--- a/gst/playondemand/gstplayondemand.c
+++ b/gst/playondemand/gstplayondemand.c
@@ -81,7 +81,6 @@ static void play_on_demand_get_property (GObject *object, guint prop_id, GValue
 static void play_on_demand_dispose      (GObject *object);
 
 /* GStreamer functionality */
-static GstBufferPool*   play_on_demand_get_bufferpool (GstPad *pad);
 static GstPadLinkReturn play_on_demand_pad_link       (GstPad *pad, const GstCaps2 *caps);
 static void             play_on_demand_loop           (GstElement *elem);
 static void             play_on_demand_set_clock      (GstElement *elem, GstClock *clock);
@@ -236,7 +235,6 @@ play_on_demand_init (GstPlayOnDemand *filter)
   filter->sinkpad = gst_pad_new_from_template(
       gst_static_pad_template_get(&play_on_demand_sink_template), "sink");
 
-  gst_pad_set_bufferpool_function(filter->sinkpad, play_on_demand_get_bufferpool);
   gst_pad_set_link_function(filter->sinkpad, play_on_demand_pad_link);
 
   gst_element_add_pad(GST_ELEMENT(filter), filter->sinkpad);
@@ -366,14 +364,6 @@ play_on_demand_dispose (GObject *object)
   g_free (filter->buffer);
 }
 
-static GstBufferPool*
-play_on_demand_get_bufferpool (GstPad *pad)
-{
-  GstPlayOnDemand *filter;
-  filter = GST_PLAYONDEMAND(gst_pad_get_parent(pad));
-  return gst_pad_get_bufferpool(filter->srcpad);
-}
-
 static GstPadLinkReturn
 play_on_demand_pad_link (GstPad *pad, const GstCaps2 *caps)
 {
@@ -433,12 +423,6 @@ play_on_demand_loop (GstElement *elem)
   g_return_if_fail(filter != NULL);
   g_return_if_fail(GST_IS_PLAYONDEMAND(filter));
 
-  filter->bufpool = gst_pad_get_bufferpool(filter->srcpad);
-
-  if (filter->bufpool == NULL)
-    filter->bufpool = gst_buffer_pool_get_default(GST_POD_BUFPOOL_SIZE,
-                                                  GST_POD_BUFPOOL_NUM);
-
   in = (in == NULL && ! filter->eos) ? gst_pad_pull(filter->sinkpad) : NULL;
 
   if (filter->format == GST_PLAYONDEMAND_FORMAT_INT) {
diff --git a/gst/playondemand/gstplayondemand.h b/gst/playondemand/gstplayondemand.h
index 8c7fa212..c99c8165 100644
--- a/gst/playondemand/gstplayondemand.h
+++ b/gst/playondemand/gstplayondemand.h
@@ -53,7 +53,6 @@ enum _GstPlayOnDemandFormat {
 struct _GstPlayOnDemand {
   GstElement element;
 
-  GstBufferPool *bufpool;
   GstPad   *sinkpad, *srcpad;
   GstClock *clock;