OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix AutoRemux not working when FFmpeg output configured

Browse source 
When the Advanced Output configuration is set to use custom FFmpeg
output, automatic remuxing is disabled. Unfortunately this check will
also take place even if Simple Output is used (as the value is set in
the configuration data, but is not "active").

This check ensures that the check for custom FFmpeg output is only
applied when Advanced Output is enabled.
This commit is contained in:
PatTheMav 2022-09-27 19:39:28 +02:00 committed by Jim
parent cbb910a99c
commit 8a4cf4b739
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
UI/window-basic-main.cpp
View file

@ -7122,17 +7122,31 @@ void OBSBasic::StreamingStop(int code, QString last_error)
void OBSBasic::AutoRemux(QString input, bool no_show)
{
bool autoRemux = config_get_bool(Config(), "Video", "AutoRemux");
auto config = Config();
bool autoRemux = config_get_bool(config, "Video", "AutoRemux");
if (!autoRemux)
return;
const char *recType = config_get_string(Config(), "AdvOut", "RecType");
bool isSimpleMode = false;
bool ffmpegOutput = astrcmpi(recType, "FFmpeg") == 0;
const char *mode = config_get_string(config, "Output", "Mode");
if (!mode) {
isSimpleMode = true;
} else {
isSimpleMode = strcmp(mode, "Simple") == 0;
}
if (ffmpegOutput)
return;
if (!isSimpleMode) {
const char *recType =
config_get_string(config, "AdvOut", "RecType");
bool ffmpegOutput = astrcmpi(recType, "FFmpeg") == 0;
if (ffmpegOutput)
return;
}
if (input.isEmpty())
return;