jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Check if output active when setting encoders 

This fixes an issue where someone might mistakenly try to change an
audio/video encoder before the output is complete.
master
jp9000 2020-09-23 14:47:30 -07:00
parent e9a0b41795
commit e1447c22db
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libobs/obs-output.c
View File

@ -807,6 +807,13 @@ void obs_output_set_video_encoder(obs_output_t *output, obs_encoder_t *encoder)
"encoder passed is not a video encoder"); "encoder passed is not a video encoder");
return; return;
} }
if (active(output)) {
blog(LOG_WARNING,
"%s: tried to set video encoder on output \"%s\" "
"while the output is still active!",
__FUNCTION__, output->context.name);
return;
}
if (output->video_encoder == encoder) if (output->video_encoder == encoder)
return; return;
@ -832,6 +839,13 @@ void obs_output_set_audio_encoder(obs_output_t *output, obs_encoder_t *encoder,
"encoder passed is not an audio encoder"); "encoder passed is not an audio encoder");
return; return;
} }
if (active(output)) {
blog(LOG_WARNING,
"%s: tried to set audio encoder %d on output \"%s\" "
"while the output is still active!",
__FUNCTION__, (int)idx, output->context.name);
return;
}
if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) { if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
if (idx >= MAX_AUDIO_MIXES) { if (idx >= MAX_AUDIO_MIXES) {