mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

obs-ffmpeg/ffmpeg-mux: Fix hang without global_stream_key

Browse Source 
If DEBUG_FFMPEG_MUX is enabled, when starting a recording without
configuring global_stream_key, obs-ffmpeg-mux will hang. Apply same
check to global_stream_key as in init_params() to prevent this.
This commit is contained in:
floele 2021-03-21 08:54:57 +01:00 committed by Jim
parent cc4ffff6b0
commit 44c38e71cc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
View File

@ -237,7 +237,9 @@ static void ffmpeg_log_callback(void *param, int level, const char *format,
vsnprintf(out_buffer, sizeof(out_buffer), format, args);
dstr_copy(&out, out_buffer);
dstr_replace(&out, global_stream_key, "{stream_key}");
if (global_stream_key && *global_stream_key) {
dstr_replace(&out, global_stream_key, "{stream_key}");
}
switch (level) {
case AV_LOG_INFO: