mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
obs-ffmpeg/ffmpeg-mux: Fix hang without global_stream_key
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:
parent
cc4ffff6b0
commit
44c38e71cc
@ -237,7 +237,9 @@ static void ffmpeg_log_callback(void *param, int level, const char *format,
|
|||||||
|
|
||||||
vsnprintf(out_buffer, sizeof(out_buffer), format, args);
|
vsnprintf(out_buffer, sizeof(out_buffer), format, args);
|
||||||
dstr_copy(&out, out_buffer);
|
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) {
|
switch (level) {
|
||||||
case AV_LOG_INFO:
|
case AV_LOG_INFO:
|
||||||
|
Loading…
Reference in New Issue
Block a user