diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index 21c4cb363d89871d18ef53becbe3c0fd3c7c418d..a4c9af721a56cc074de1d74b679a478383ac6fe6 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -2936,8 +2936,8 @@ 0 0 - 98 - 28 + 800 + 69 @@ -3091,10 +3091,10 @@ - 30 + 10 - 3 + 0 @@ -3106,6 +3106,11 @@ 20 + + + 24 NTSC + + 29.97 @@ -3255,8 +3260,8 @@ 0 0 - 98 - 28 + 818 + 697 diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 7f4b106318074cb615fc95a7d47d6a14c5993684..dfba7709fcad9ffa5c45be9271f1d816dc26b6ab 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4487,6 +4487,9 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const } else if (strcmp(val, "20") == 0) { num = 20; den = 1; + } else if (strcmp(val, "24 NTSC") == 0) { + num = 24000; + den = 1001; } else if (strcmp(val, "25") == 0) { num = 25; den = 1; diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 18080f09123e06fc5a4e341bd0faf03c925ff6e3..cd12606c1d1c38331a409c6531300c354baac12e 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -1192,7 +1192,7 @@ static inline void LoadFPSCommon(OBSBasic *main, Ui::OBSBasicSettings *ui) "FPSCommon"); int idx = ui->fpsCommon->findText(val); - if (idx == -1) idx = 3; + if (idx == -1) idx = 4; ui->fpsCommon->setCurrentIndex(idx); }