diff --git a/frontend/data/locale/en-US.ini b/frontend/data/locale/en-US.ini index 596f09664..908af1589 100644 --- a/frontend/data/locale/en-US.ini +++ b/frontend/data/locale/en-US.ini @@ -1025,8 +1025,8 @@ Basic.Settings.Output.Format.MP4="MPEG-4 (.mp4)" Basic.Settings.Output.Format.MOV="QuickTime (.mov)" Basic.Settings.Output.Format.TS="MPEG-TS (.ts)" Basic.Settings.Output.Format.HLS="HLS (.m3u8 + .ts)" -Basic.Settings.Output.Format.hMP4="Hybrid MP4 [BETA] (.mp4)" -Basic.Settings.Output.Format.hMOV="Hybrid MOV [BETA] (.mov)" +Basic.Settings.Output.Format.hMP4="Hybrid MP4 (.mp4)" +Basic.Settings.Output.Format.hMOV="Hybrid MOV (.mov)" Basic.Settings.Output.Format.fMP4="Fragmented MP4 (.mp4)" Basic.Settings.Output.Format.fMOV="Fragmented MOV (.mov)" Basic.Settings.Output.Format.TT.fragmented_mov="Fragmented MOV writes the recording in chunks and does not require the same finalization as traditional MOV files.\nThis ensures the file remains playable even if writing to disk is interrupted, for example, as a result of a BSOD or power loss.\n\nThis may not be compatible with all players and editors. Use File → Remux Recordings to convert the file into a more compatible format if necessary." diff --git a/frontend/widgets/OBSBasic.cpp b/frontend/widgets/OBSBasic.cpp index 81c181b50..eba12d7e2 100644 --- a/frontend/widgets/OBSBasic.cpp +++ b/frontend/widgets/OBSBasic.cpp @@ -571,18 +571,10 @@ OBSBasic::OBSBasic(QWidget *parent) : OBSMainWindow(parent), undo_s(ui), ui(new static const double scaled_vals[] = {1.0, 1.25, (1.0 / 0.75), 1.5, (1.0 / 0.6), 1.75, 2.0, 2.25, 2.5, 2.75, 3.0, 0.0}; #ifdef __APPLE__ // macOS -#if OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0 -#define DEFAULT_CONTAINER "fragmented_mov" -#else #define DEFAULT_CONTAINER "hybrid_mov" -#endif #else // Windows/Linux -#if OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0 -#define DEFAULT_CONTAINER "mkv" -#else #define DEFAULT_CONTAINER "hybrid_mp4" #endif -#endif bool OBSBasic::InitBasicConfigDefaults() {