From 75e153bb13fc3292a521c87e4f8ca25b2342beb9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 26 Aug 2011 14:20:49 +0200
Subject: [PATCH] allocation: fix for vmethod changes

---
 gst/effectv/gstwarp.c  | 6 +++---
 sys/v4l2/gstv4l2sink.c | 8 ++++----
 sys/v4l2/gstv4l2src.c  | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 2fae3e5..72a45c0 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -243,7 +243,7 @@ gst_warptv_start (GstBaseTransform * trans)
 }
 
 static gboolean
-gst_wraptv_setup_allocation (GstBaseTransform * trans, GstQuery * query)
+gst_wraptv_decide_allocation (GstBaseTransform * trans, GstQuery * query)
 {
   GstBufferPool *pool = NULL;
   guint size, min, max, prefix, alignment;
@@ -294,8 +294,8 @@ gst_warptv_class_init (GstWarpTVClass * klass)
 
   trans_class->start = GST_DEBUG_FUNCPTR (gst_warptv_start);
   trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_warptv_set_caps);
-  trans_class->setup_allocation =
-      GST_DEBUG_FUNCPTR (gst_wraptv_setup_allocation);
+  trans_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_wraptv_decide_allocation);
   trans_class->transform = GST_DEBUG_FUNCPTR (gst_warptv_transform);
 
   initSinTable ();
diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c
index 93bb207..5ad4a18 100644
--- a/sys/v4l2/gstv4l2sink.c
+++ b/sys/v4l2/gstv4l2sink.c
@@ -135,7 +135,7 @@ static GstStateChangeReturn gst_v4l2sink_change_state (GstElement * element,
     GstStateChange transition);
 
 /* GstBaseSink methods: */
-static gboolean gst_v4l2sink_setup_allocation (GstBaseSink * bsink,
+static gboolean gst_v4l2sink_propose_allocation (GstBaseSink * bsink,
     GstQuery * query);
 static GstCaps *gst_v4l2sink_get_caps (GstBaseSink * bsink, GstCaps * filter);
 static gboolean gst_v4l2sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
@@ -211,8 +211,8 @@ gst_v4l2sink_class_init (GstV4l2SinkClass * klass)
 
   basesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_v4l2sink_get_caps);
   basesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_v4l2sink_set_caps);
-  basesink_class->setup_allocation =
-      GST_DEBUG_FUNCPTR (gst_v4l2sink_setup_allocation);
+  basesink_class->propose_allocation =
+      GST_DEBUG_FUNCPTR (gst_v4l2sink_propose_allocation);
   basesink_class->render = GST_DEBUG_FUNCPTR (gst_v4l2sink_show_frame);
 
   klass->v4l2_class_devices = NULL;
@@ -620,7 +620,7 @@ invalid_format:
 }
 
 static gboolean
-gst_v4l2sink_setup_allocation (GstBaseSink * bsink, GstQuery * query)
+gst_v4l2sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
 {
   GstV4l2Sink *v4l2sink = GST_V4L2SINK (bsink);
   GstV4l2Object *obj = v4l2sink->v4l2object;
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index d1b3317..4e01c62 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -122,7 +122,7 @@ static gboolean gst_v4l2src_stop (GstBaseSrc * src);
 static gboolean gst_v4l2src_set_caps (GstBaseSrc * src, GstCaps * caps);
 static GstCaps *gst_v4l2src_get_caps (GstBaseSrc * src, GstCaps * filter);
 static gboolean gst_v4l2src_query (GstBaseSrc * bsrc, GstQuery * query);
-static gboolean gst_v4l2src_setup_allocation (GstBaseSrc * src,
+static gboolean gst_v4l2src_decide_allocation (GstBaseSrc * src,
     GstQuery * query);
 static GstFlowReturn gst_v4l2src_fill (GstPushSrc * src, GstBuffer * out);
 static void gst_v4l2src_fixate (GstBaseSrc * basesrc, GstCaps * caps);
@@ -191,8 +191,8 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
   basesrc_class->query = GST_DEBUG_FUNCPTR (gst_v4l2src_query);
   basesrc_class->fixate = GST_DEBUG_FUNCPTR (gst_v4l2src_fixate);
   basesrc_class->negotiate = GST_DEBUG_FUNCPTR (gst_v4l2src_negotiate);
-  basesrc_class->setup_allocation =
-      GST_DEBUG_FUNCPTR (gst_v4l2src_setup_allocation);
+  basesrc_class->decide_allocation =
+      GST_DEBUG_FUNCPTR (gst_v4l2src_decide_allocation);
 
   pushsrc_class->fill = GST_DEBUG_FUNCPTR (gst_v4l2src_fill);
 
@@ -505,7 +505,7 @@ gst_v4l2src_set_caps (GstBaseSrc * src, GstCaps * caps)
 }
 
 static gboolean
-gst_v4l2src_setup_allocation (GstBaseSrc * bsrc, GstQuery * query)
+gst_v4l2src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
 {
   GstV4l2Src *src;
   GstV4l2Object *obj;
-- 
2.7.4