diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index 826b19f1b..09205f7b2 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -779,7 +779,6 @@ Basic.Settings.Output.NoSpaceFileName="Generate File Name without Space"
Basic.Settings.Output.Adv.Rescale="Rescale Output"
Basic.Settings.Output.Adv.AudioTrack="Audio Track"
Basic.Settings.Output.Adv.Streaming="Streaming"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Enforce streaming service encoder settings"
Basic.Settings.Output.Adv.Audio.Track1="Track 1"
Basic.Settings.Output.Adv.Audio.Track2="Track 2"
Basic.Settings.Output.Adv.Audio.Track3="Track 3"
diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui
index 27e29ebb5..3ade98627 100644
--- a/UI/forms/OBSBasicSettings.ui
+++ b/UI/forms/OBSBasicSettings.ui
@@ -1937,55 +1937,6 @@
- -
-
-
- Basic.Settings.Output.Encoder
-
-
- advOutEncoder
-
-
-
- -
-
-
- -
-
-
- Basic.Settings.Output.Adv.ApplyServiceSettings
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Basic.Settings.Output.Adv.Rescale
-
-
-
- -
-
-
- false
-
-
- true
-
-
-
-
@@ -2055,6 +2006,45 @@
+ -
+
+
+ Basic.Settings.Output.Encoder
+
+
+ advOutEncoder
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::RightToLeft
+
+
+ Basic.Settings.Output.Adv.Rescale
+
+
+
+ -
+
+
+ false
+
+
+ true
+
+
+
@@ -4639,7 +4629,7 @@
0
0
- 803
+ 602
781
@@ -5534,7 +5524,6 @@
advOutTrack5
advOutTrack6
advOutEncoder
- advOutApplyService
advOutUseRescale
advOutRescale
advOutRecType
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index 70237ed8c..6bfaa328d 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -451,7 +451,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->advOutTrack4, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutTrack5, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutTrack6, CHECK_CHANGED, OUTPUTS_CHANGED);
- HookWidget(ui->advOutApplyService, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutRecType, COMBO_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutRecPath, EDIT_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutNoSpace, CHECK_CHANGED, OUTPUTS_CHANGED);
@@ -1762,10 +1761,7 @@ void OBSBasicSettings::LoadAdvOutputStreamingSettings()
const char *rescaleRes =
config_get_string(main->Config(), "AdvOut", "RescaleRes");
int trackIndex = config_get_int(main->Config(), "AdvOut", "TrackIndex");
- bool applyServiceSettings = config_get_bool(main->Config(), "AdvOut",
- "ApplyServiceSettings");
- ui->advOutApplyService->setChecked(applyServiceSettings);
ui->advOutUseRescale->setChecked(rescale);
ui->advOutRescale->setEnabled(rescale);
ui->advOutRescale->setCurrentText(rescaleRes);
@@ -3382,7 +3378,6 @@ void OBSBasicSettings::SaveOutputSettings()
curAdvStreamEncoder = GetComboData(ui->advOutEncoder);
- SaveCheckBox(ui->advOutApplyService, "AdvOut", "ApplyServiceSettings");
SaveComboData(ui->advOutEncoder, "AdvOut", "Encoder");
SaveCheckBox(ui->advOutUseRescale, "AdvOut", "Rescale");
SaveCombo(ui->advOutRescale, "AdvOut", "RescaleRes");