summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/rtp/gstrtpmp4vpay.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e7c0c66..ab045fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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),
(gst_rtp_mp4v_pay_setcaps):
Don't waste time looking for a config string if we have codec_info
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index b8af1bef..f08f10fb 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;
}