Selaa lähdekoodia

UI: Set default recording format to Fragmented MOV on macOS

In 22205d582c6b2c010e2f48d52067eecb77c8857f, the change to default to
Fragmented MP4/MOV on all platforms was reverted due to compatibility
issues with the default video player on Windows.
On macOS however, the default player (QuickTime Player) works fine with
fragmented formats, and instead is unable to play MKV files (which have
always been the default format for OBS). This change makes videos with
the default settings playable on macOS with the default player.
gxalpha 1 vuosi sitten
vanhempi
sitoutus
fad6f43608
1 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 4 3
      UI/window-basic-main.cpp

+ 4 - 3
UI/window-basic-main.cpp

@@ -1453,10 +1453,11 @@ static const double scaled_vals[] = {1.0,         1.25, (1.0 / 0.75), 1.5,
 				     2.5,         2.75, 3.0,          0.0};
 				     2.5,         2.75, 3.0,          0.0};
 
 
 extern void CheckExistingCookieId();
 extern void CheckExistingCookieId();
-#if OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0
-#define DEFAULT_CONTAINER "mkv"
-#elif defined(__APPLE__)
+
+#ifdef __APPLE__
 #define DEFAULT_CONTAINER "fragmented_mov"
 #define DEFAULT_CONTAINER "fragmented_mov"
+#elif OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0
+#define DEFAULT_CONTAINER "mkv"
 #else
 #else
 #define DEFAULT_CONTAINER "fragmented_mp4"
 #define DEFAULT_CONTAINER "fragmented_mp4"
 #endif
 #endif