mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-21 13:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1731 from Gol-D-Ace/PAL-FPS

Browse Source 
UI: Add PAL 25 & 50 FPS as common FPS values
This commit is contained in:
Colin Edwards authored and GitHub committed 2019-03-10 01:55:00 -06:00
2 parents 045aa71e09 7c0620b54f
commit fea204411d
2 files changed
+14 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/forms/OBSBasicSettings.ui
+10
View File
@@ -4073,6 +4073,11 @@
<string>24 NTSC</string>
</property>
</item>
<item>
<property name="text">
<string>25 PAL</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">29.97</string>
@@ -4088,6 +4093,11 @@
<string notr="true">48</string>
</property>
</item>
<item>
<property name="text">
<string>50 PAL</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">59.94</string>
UI/window-basic-main.cpp
+4 -1
View File
@@ -5693,7 +5693,7 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const
} else if (strcmp(val, "24 NTSC") == 0) {
num = 24000;
den = 1001;
} else if (strcmp(val, "25") == 0) {
} else if (strcmp(val, "25 PAL") == 0) {
num = 25;
den = 1;
} else if (strcmp(val, "29.97") == 0) {
@@ -5702,6 +5702,9 @@ void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const
} else if (strcmp(val, "48") == 0) {
num = 48;
den = 1;
} else if (strcmp(val, "50 PAL") == 0) {
num = 50;
den = 1;
} else if (strcmp(val, "59.94") == 0) {
num = 60000;
den = 1001;