From 6933d12a9b71625c33544d6894236900156e9098 Mon Sep 17 00:00:00 2001
From: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
Date: Fri, 4 Jun 2010 12:24:16 +0200
Subject: [PATCH] vdpau: remove gst_vdp_video_src_pad_set_caps

---
 sys/vdpau/gstvdpmpegdec.c     |  3 +--
 sys/vdpau/gstvdpvideosrcpad.c | 17 ++++++-----------
 sys/vdpau/gstvdpvideosrcpad.h |  2 --
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/sys/vdpau/gstvdpmpegdec.c b/sys/vdpau/gstvdpmpegdec.c
index 460f2e32e0..63fb5be0aa 100644
--- a/sys/vdpau/gstvdpmpegdec.c
+++ b/sys/vdpau/gstvdpmpegdec.c
@@ -176,8 +176,7 @@ gst_vdp_mpeg_dec_set_caps (GstPad * pad, GstCaps * caps)
   GST_DEBUG_OBJECT (mpeg_dec, "Setting source caps to %" GST_PTR_FORMAT,
       src_caps);
 
-  res = gst_vdp_video_src_pad_set_caps
-      (GST_VDP_VIDEO_SRC_PAD (mpeg_dec->src), src_caps);
+  res = gst_pad_set_caps (mpeg_dec->src, src_caps);
   gst_caps_unref (src_caps);
   if (!res)
     goto done;
diff --git a/sys/vdpau/gstvdpvideosrcpad.c b/sys/vdpau/gstvdpvideosrcpad.c
index 8b701a328f..1ce4aad2c6 100644
--- a/sys/vdpau/gstvdpvideosrcpad.c
+++ b/sys/vdpau/gstvdpvideosrcpad.c
@@ -204,19 +204,12 @@ wrong_caps:
   return GST_FLOW_ERROR;
 }
 
-gboolean
-gst_vdp_video_src_pad_set_caps (GstVdpVideoSrcPad * vdp_pad, GstCaps * caps)
+static gboolean
+gst_vdp_video_src_pad_setcaps (GstPad * pad, GstCaps * caps)
 {
+  GstVdpVideoSrcPad *vdp_pad = GST_VDP_VIDEO_SRC_PAD (pad);
   const GstStructure *structure;
 
-  g_return_val_if_fail (GST_IS_VDP_VIDEO_SRC_PAD (vdp_pad), FALSE);
-
-  if (G_UNLIKELY (!caps))
-    return gst_pad_set_caps (GST_PAD (vdp_pad), caps);
-
-  if (G_UNLIKELY (!GST_IS_CAPS (caps) || !gst_caps_is_fixed (caps)))
-    return FALSE;
-
   structure = gst_caps_get_structure (caps, 0);
   if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
     if (!gst_structure_get_int (structure, "width", &vdp_pad->width))
@@ -237,7 +230,7 @@ gst_vdp_video_src_pad_set_caps (GstVdpVideoSrcPad * vdp_pad, GstCaps * caps)
   } else
     return FALSE;
 
-  return gst_pad_set_caps (GST_PAD (vdp_pad), caps);
+  return TRUE;
 }
 
 GstVdpDevice *
@@ -346,6 +339,8 @@ gst_vdp_video_src_pad_init (GstVdpVideoSrcPad * vdp_pad)
 
   gst_pad_set_getcaps_function (pad,
       GST_DEBUG_FUNCPTR (gst_vdp_video_src_pad_getcaps));
+  gst_pad_set_setcaps_function (pad,
+      GST_DEBUG_FUNCPTR (gst_vdp_video_src_pad_setcaps));
   gst_pad_set_activatepush_function (pad,
       GST_DEBUG_FUNCPTR (gst_vdp_video_src_pad_activate_push));
 }
diff --git a/sys/vdpau/gstvdpvideosrcpad.h b/sys/vdpau/gstvdpvideosrcpad.h
index 300c5e19f5..1a32c62351 100644
--- a/sys/vdpau/gstvdpvideosrcpad.h
+++ b/sys/vdpau/gstvdpvideosrcpad.h
@@ -43,8 +43,6 @@ GstFlowReturn gst_vdp_video_src_pad_alloc_buffer (GstVdpVideoSrcPad *vdp_pad, Gs
 
 GstVdpDevice *gst_vdp_video_src_pad_get_device (GstVdpVideoSrcPad *vdp_pad);
 
-gboolean gst_vdp_video_src_pad_set_caps (GstVdpVideoSrcPad *vdp_pad, GstCaps *caps);
-
 GstCaps *gst_vdp_video_src_pad_get_template_caps ();
 
 GstVdpVideoSrcPad * gst_vdp_video_src_pad_new (GstPadTemplate * templ, const gchar * name);