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

Fix bug removing output from its previous encoders

Browse Source 
When the output sets a new audio/video encoder, it was not properly
removing itself from the previous audio/video encoders it was associated
with.  It was erroneously removing itself from the encoder parameter
instead.
This commit is contained in:
jp9000 2014-10-22 19:42:09 -07:00
parent d14dbbc540
commit 0f2e4f8e0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/obs-output.c
View File

@ -343,7 +343,7 @@ void obs_output_set_video_encoder(obs_output_t *output, obs_encoder_t *encoder)
if (output->video_encoder == encoder) return;
if (encoder && encoder->info.type != OBS_ENCODER_VIDEO) return;
obs_encoder_remove_output(encoder, output);
obs_encoder_remove_output(output->video_encoder, output);
obs_encoder_add_output(encoder, output);
output->video_encoder = encoder;
@ -359,7 +359,7 @@ void obs_output_set_audio_encoder(obs_output_t *output, obs_encoder_t *encoder)
if (output->audio_encoder == encoder) return;
if (encoder && encoder->info.type != OBS_ENCODER_AUDIO) return;
obs_encoder_remove_output(encoder, output);
obs_encoder_remove_output(output->audio_encoder, output);
obs_encoder_add_output(encoder, output);
output->audio_encoder = encoder;
}