From bdfead801e9234a4ee6389672d1003bdbdbe0e7f Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sun, 18 Jun 2023 22:26:07 -0300 Subject: [PATCH] linux-pipewire: Explicitly handle NULL format strings This is a workaround to the compiler complaining about directive arguments being null. --- plugins/linux-pipewire/pipewire.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/linux-pipewire/pipewire.c b/plugins/linux-pipewire/pipewire.c index f62330f9f..a89c4eaee 100644 --- a/plugins/linux-pipewire/pipewire.c +++ b/plugins/linux-pipewire/pipewire.c @@ -1013,6 +1013,7 @@ static void on_param_changed_cb(void *user_data, uint32_t id, obs_pipewire *obs_pw = obs_pw_stream->obs_pw; struct spa_pod_builder pod_builder; const struct spa_pod *params[5]; + const char *format_name; uint32_t n_params = 0; uint32_t buffer_types; uint32_t output_flags; @@ -1046,10 +1047,11 @@ static void on_param_changed_cb(void *user_data, uint32_t id, blog(LOG_INFO, "[pipewire] Negotiated format:"); + format_name = spa_debug_type_find_name( + spa_type_video_format, obs_pw_stream->format.info.raw.format); blog(LOG_INFO, "[pipewire] Format: %d (%s)", obs_pw_stream->format.info.raw.format, - spa_debug_type_find_name(spa_type_video_format, - obs_pw_stream->format.info.raw.format)); + format_name ? format_name : "unknown format"); if (has_modifier) { blog(LOG_INFO, "[pipewire] Modifier: 0x%" PRIx64,