Skip to content

Commit

Permalink
Bump to GStreamer 1.24.11
Browse files Browse the repository at this point in the history
And add a new patch scheduled to ship in 1.24.12.
  • Loading branch information
philn committed Jan 20, 2025
1 parent 11d89fa commit 1506051
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 8c829fdc37486abd0dac2729020bcdeb33f25e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <[email protected]>
Date: Fri, 23 Feb 2024 15:20:41 +0100
Subject: [PATCH] sdp: accept empty attribute value represented as a NULL
pointer

Some empty media attribute values are set to an empty string, others as a NULL
pointer. It seems that code is able to deal with both, except for the UTF8
validation.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6119>
---
subprojects/gst-plugins-base/gst-libs/gst/sdp/gstsdpmessage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/sdp/gstsdpmessage.c b/subprojects/gst-plugins-base/gst-libs/gst/sdp/gstsdpmessage.c
index a08bbc96d1..96ed5fd5a2 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/sdp/gstsdpmessage.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/sdp/gstsdpmessage.c
@@ -4278,7 +4278,7 @@ sdp_add_attributes_to_caps (GArray * attributes, GstCaps * caps)
continue;

/* string must be valid UTF8 */
- if (!g_utf8_validate (attr->value, -1, NULL))
+ if (attr->value != NULL && !g_utf8_validate (attr->value, -1, NULL))
continue;

if (!g_str_has_prefix (key, "x-"))
--
2.47.1

3 changes: 2 additions & 1 deletion images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<branch repo="gstreamer.freedesktop.org"
checkoutdir="gstreamer"
module="gstreamer.git"
tag="1.24.9">
tag="1.24.11">
<patch file="0004-pad-Never-push-sticky-events-in-response-to-a-FLUSH_.patch"/>
<patch file="0001-webrtcbin-create-and-associate-transceivers-earlier-.patch"/>
<patch file="0002-webrtcbin-reverse-direction-from-remote-media.patch"/>
Expand All @@ -120,6 +120,7 @@
<patch file="0007-rtpfunnel-also-fallback-to-pad-default-handling-for-.patch"/>
<patch file="0008-webrtcbin-enable-forward-unknown-ssrc-on-rtpfunnel.patch"/>
<patch file="0009-rtpfunnel-Ensure-segment-events-are-forwarded-after-.patch"/>
<patch file="0009-sdp-accept-empty-attribute-value-represented-as-a-NU.patch"/>
</branch>
<dependencies>
<dep package="openh264"/>
Expand Down

0 comments on commit 1506051

Please sign in to comment.