Index: gst/gstpad.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.550
diff -u -p -u -p -r1.550 gstpad.c
--- gst/gstpad.c	22 Mar 2007 18:28:00 -0000	1.550
+++ gst/gstpad.c	25 Mar 2007 19:22:16 -0000
@@ -2411,11 +2411,9 @@ gst_pad_configure_sink (GstPad * pad, Gs
 
   setcaps = GST_PAD_SETCAPSFUNC (pad);
 
-  /* See if pad accepts the caps - only needed if 
-   * no setcaps function */
-  if (setcaps == NULL)
-    if (!gst_pad_accept_caps (pad, caps))
-      goto not_accepted;
+  /* See if pad accepts the caps no setcaps function */
+  if (!gst_pad_accept_caps (pad, caps))
+    goto not_accepted;
 
   /* set caps on pad if call succeeds */
   res = gst_pad_set_caps (pad, caps);
@@ -2441,11 +2439,9 @@ gst_pad_configure_src (GstPad * pad, Gst
 
   setcaps = GST_PAD_SETCAPSFUNC (pad);
 
-  /* See if pad accepts the caps - only needed if 
-   * no setcaps function */
-  if (setcaps == NULL)
-    if (!gst_pad_accept_caps (pad, caps))
-      goto not_accepted;
+  /* See if pad accepts the caps */
+  if (!gst_pad_accept_caps (pad, caps))
+    goto not_accepted;
 
   if (dosetcaps)
     res = gst_pad_set_caps (pad, caps);
