diff --git a/ChangeLog b/ChangeLog
index 5e7c0c6699..ab045fe8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-10  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_setcaps):
+	First set options, then set caps or else the baseclass
+	will not know about the options, duh.
+
 2006-02-10  Wim Taymans  <wim@fluendo.com>
 
 	* gst/rtp/gstrtpmp4vpay.c: (gst_rtp_mp4v_pay_class_init),
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index b8af1bef5f..f08f10fbae 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -204,6 +204,9 @@ gst_rtp_mp4v_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
 
   rtpmp4vpay = GST_RTP_MP4V_PAY (payload);
 
+  gst_basertppayload_set_options (payload, "video", TRUE, "MP4V-ES",
+      rtpmp4vpay->rate);
+
   structure = gst_caps_get_structure (caps, 0);
   codec_info = gst_structure_get_value (structure, "codec_info");
   if (codec_info) {
@@ -233,9 +236,6 @@ gst_rtp_mp4v_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
   }
 
 done:
-  gst_basertppayload_set_options (payload, "video", TRUE, "MP4V-ES",
-      rtpmp4vpay->rate);
-
   return TRUE;
 }