Index: gst-libs/gst/rtp/gstbasertpdepayload.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertpdepayload.c,v
retrieving revision 1.23
diff -u -r1.23 gstbasertpdepayload.c
--- gst-libs/gst/rtp/gstbasertpdepayload.c	22 Nov 2005 18:32:09 -0000	1.23
+++ gst-libs/gst/rtp/gstbasertpdepayload.c	23 Nov 2005 21:20:01 -0000
@@ -295,7 +295,9 @@
   GST_DEBUG_OBJECT (filter, "calculating ts : timestamp : %u, clockrate : %u",
       timestamp, filter->clock_rate);
 
-  GST_BUFFER_TIMESTAMP (buf) = ts;
+  /* add delay to timestamp */
+  GST_BUFFER_TIMESTAMP (buf) = ts + (filter->queue_delay * GST_MSECOND);
+  
   GST_DEBUG_OBJECT (filter, "calculated ts %"
       GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
 
@@ -309,9 +311,6 @@
     filter->need_newsegment = FALSE;
     GST_DEBUG_OBJECT (filter, "Pushed newsegment event on this first buffer");
   }
-  /* add delay to timestamp */
-  GST_BUFFER_TIMESTAMP (buf) =
-      GST_BUFFER_TIMESTAMP (buf) + (filter->queue_delay * GST_MSECOND);
 }
 
 static void
