mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
rtpmanager: Make sure that used caps are not freed already (take 2)
This reintroduces the fix for bug #593391. It also applies it in gst_rtp_session_sync_rtcp() which has very similar code to gst_rtp_session_send_rtcp().
This commit is contained in:
parent
8d924611e7
commit
923b5b495a
1 changed files with 4 additions and 2 deletions
|
@ -1032,9 +1032,10 @@ gst_rtp_session_send_rtcp (RTPSession * sess, RTPSource * src,
|
||||||
if (!(caps = GST_PAD_CAPS (rtcp_src))) {
|
if (!(caps = GST_PAD_CAPS (rtcp_src))) {
|
||||||
caps = gst_caps_new_simple ("application/x-rtcp", NULL);
|
caps = gst_caps_new_simple ("application/x-rtcp", NULL);
|
||||||
gst_pad_set_caps (rtcp_src, caps);
|
gst_pad_set_caps (rtcp_src, caps);
|
||||||
|
} else
|
||||||
gst_caps_unref (caps);
|
gst_caps_unref (caps);
|
||||||
}
|
|
||||||
gst_buffer_set_caps (buffer, caps);
|
gst_buffer_set_caps (buffer, caps);
|
||||||
|
gst_caps_unref (caps);
|
||||||
GST_LOG_OBJECT (rtpsession, "sending RTCP");
|
GST_LOG_OBJECT (rtpsession, "sending RTCP");
|
||||||
|
|
||||||
gst_object_ref (rtcp_src);
|
gst_object_ref (rtcp_src);
|
||||||
|
@ -1092,9 +1093,10 @@ gst_rtp_session_sync_rtcp (RTPSession * sess,
|
||||||
if (!(caps = GST_PAD_CAPS (sync_src))) {
|
if (!(caps = GST_PAD_CAPS (sync_src))) {
|
||||||
caps = gst_caps_new_simple ("application/x-rtcp", NULL);
|
caps = gst_caps_new_simple ("application/x-rtcp", NULL);
|
||||||
gst_pad_set_caps (sync_src, caps);
|
gst_pad_set_caps (sync_src, caps);
|
||||||
|
} else
|
||||||
gst_caps_unref (caps);
|
gst_caps_unref (caps);
|
||||||
}
|
|
||||||
gst_buffer_set_caps (buffer, caps);
|
gst_buffer_set_caps (buffer, caps);
|
||||||
|
gst_caps_unref (caps);
|
||||||
gst_object_ref (sync_src);
|
gst_object_ref (sync_src);
|
||||||
GST_RTP_SESSION_UNLOCK (rtpsession);
|
GST_RTP_SESSION_UNLOCK (rtpsession);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue