From 2bbf2b424d5edc180528bf9ab99b5a07ec9824e9 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 10 Feb 2006 17:37:39 +0000 Subject: [PATCH] gst/rtp/gstrtpmp4vpay.c: First set options, then set caps or else the baseclass will not know about the options, duh. Original commit message from CVS: * 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. --- ChangeLog | 6 ++++++ gst/rtp/gstrtpmp4vpay.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e7c0c6..ab045fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-02-10 Wim Taymans + * 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 + * 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 b8af1be..f08f10f 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; } -- 2.7.4