diff --git a/ChangeLog b/ChangeLog
index 5e8fac3e32..193143228d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-31  Zeeshan Ali  <zeenix@gmail.com>
+
+	* gst-libs/gst/rtp/gstbasertpdepayload.c:
+	(gst_base_rtp_depayload_push):
+	A small fix
+
 2005-10-31  Wim Taymans  <wim@fluendo.com>
 
 	* gst-libs/gst/audio/gstringbuffer.h:
diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index 432e760263..369b190baf 100644
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -272,9 +272,11 @@ gst_base_rtp_depayload_push (GstBaseRTPDepayload * filter, GstBuffer * rtp_buf)
   out_buf = bclass->process (filter, rtp_buf);
   if (out_buf) {
     /* set the caps */
-    srccaps = gst_pad_get_caps (filter->srcpad);
-    gst_buffer_set_caps (GST_BUFFER (out_buf), srccaps);
-    gst_caps_unref (srccaps);
+    srccaps = GST_PAD_CAPS (filter->srcpad);
+
+    if (srccaps)
+      gst_buffer_set_caps (GST_BUFFER (out_buf), srccaps);
+
     /* set the timestamp
      * I am assuming here that the timestamp of the last RTP buffer
      * is the same as the timestamp wanted on the collector