From 395c8cafa691ab446842b77a8d7ce72887341fa6 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <mart.raudsepp@globalm.media>
Date: Wed, 12 Feb 2025 00:53:24 +0200
Subject: [PATCH] mpegtsmux: Fix deadlock when requesting pad for PID < 0x40

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8463>
---
 subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c b/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c
index 610397c539..c266b6e5ea 100644
--- a/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c
+++ b/subprojects/gst-plugins-bad/gst/mpegtsmux/gstbasetsmux.c
@@ -1784,8 +1784,10 @@ gst_base_ts_mux_request_new_pad (GstElement * element, GstPadTemplate * templ,
     }
     /* Make sure we don't use reserved PID.
      * FIXME : This should be extended to other variants (ex: ATSC) reserved PID */
-    if (pid < TSMUX_START_ES_PID)
+    if (pid < TSMUX_START_ES_PID) {
+      g_mutex_unlock (&mux->lock);
       goto invalid_stream_pid;
+    }
   } else {
     do {
       pid = tsmux_get_new_pid (mux->tsmux);