diff --git a/ChangeLog b/ChangeLog
index 95a39374b2..6d809df5fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-09  Sebastien Moutte  <sebastien@moutte.net>
+
+	* gst-libs/gst/rtp/gstbasertpaudiopayload.c:
+	(gst_base_rtp_audio_payload_handle_frame_based_buffer):
+	Move variable declaration before the first instruction.
+	* gst/videotestsrc/videotestsrc.c:
+	Define M_PI if it's not defined yet.
+	* win32/common/libgstrtp.def:
+	Add new exported functions.
+
 2007-05-09  Michael Smith <msmith@fluendo.com>
 
 	* ext/theora/theoradec.c: (theora_handle_type_packet):
diff --git a/common b/common
index 61edc2dc7b..a6e41a42ec 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 61edc2dc7b8eba179d85a6545e46e0d65239e94d
+Subproject commit a6e41a42ec1b93fddbd14b2e5af87e2d456b8962
diff --git a/gst-libs/gst/rtp/gstbasertpaudiopayload.c b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
index abf2ec2d00..d91155f7a0 100644
--- a/gst-libs/gst/rtp/gstbasertpaudiopayload.c
+++ b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
@@ -353,6 +353,7 @@ gst_base_rtp_audio_payload_handle_frame_based_buffer (GstBaseRTPPayload *
   guint min_payload_len;
   guint max_payload_len;
   gboolean use_adapter = FALSE;
+  guint minptime_ms;
 
   ret = GST_FLOW_OK;
 
@@ -389,7 +390,7 @@ gst_base_rtp_audio_payload_handle_frame_based_buffer (GstBaseRTPPayload *
 
   /* min number of bytes based on a given ptime, has to be a multiple
      of frame duration */
-  guint minptime_ms = basertpaudiopayload->priv->min_ptime / 1000000;
+  minptime_ms = basertpaudiopayload->priv->min_ptime / 1000000;
 
   minptime_octets = frame_size * (int) (minptime_ms / frame_duration);
 
diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c
index 1a9d56d872..fa26362b45 100644
--- a/gst/videotestsrc/videotestsrc.c
+++ b/gst/videotestsrc/videotestsrc.c
@@ -32,6 +32,10 @@
 #include <stdlib.h>
 #include <math.h>
 
+#ifndef M_PI
+#define M_PI  3.14159265358979323846
+#endif
+
 static unsigned char
 random_char (void)
 {
diff --git a/win32/common/libgstrtp.def b/win32/common/libgstrtp.def
index ab700a3412..ddb9c70745 100644
--- a/win32/common/libgstrtp.def
+++ b/win32/common/libgstrtp.def
@@ -7,6 +7,8 @@ EXPORTS
 	gst_base_rtp_audio_payload_get_type
 	gst_base_rtp_audio_payload_set_frame_based
 	gst_base_rtp_audio_payload_set_frame_options
+	gst_base_rtp_audio_payload_set_sample_based
+	gst_base_rtp_audio_payload_set_sample_options
 	gst_base_rtp_depayload_get_type
 	gst_base_rtp_depayload_push
 	gst_base_rtp_depayload_push_ts
@@ -20,6 +22,7 @@ EXPORTS
 	gst_rtp_buffer_get_payload_subbuffer
 	gst_rtp_buffer_get_payload_type
 	gst_rtp_buffer_get_seq
+	gst_rtp_buffer_get_ssrc
 	gst_rtp_buffer_get_timestamp
 	gst_rtp_buffer_new_allocate
 	gst_rtp_buffer_new_allocate_len