Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:mareksapota
obs-studio
obs-studio-disable-x264.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File obs-studio-disable-x264.patch of Package obs-studio
diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index ac4b85201..019b132fd 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -587,7 +587,7 @@ const char *get_simple_output_encoder(const char *encoder) #endif } - return "obs_x264"; + return "ffmpeg_aom_av1"; } void SimpleOutput::LoadRecordingPreset() diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index 6c683ddb7..b5f1b6773 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -1673,8 +1673,10 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly) #define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str) - ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software"), - QString(SIMPLE_ENCODER_X264)); + if (service_supports_encoder(vcodecs, "obs_x264")) + ui->simpleOutStrEncoder->addItem( + ENCODER_STR("Software"), + QString(SIMPLE_ENCODER_X264)); #ifdef _WIN32 if (service_supports_encoder(vcodecs, "obs_qsv11")) ui->simpleOutStrEncoder->addItem( diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index ec0a35d13..344fb5e24 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -5323,10 +5323,14 @@ void OBSBasicSettings::FillSimpleRecordingValues() ADD_QUALITY("HQ"); ADD_QUALITY("Lossless"); - ui->simpleOutRecEncoder->addItem(ENCODER_STR("Software"), - QString(SIMPLE_ENCODER_X264)); - ui->simpleOutRecEncoder->addItem(ENCODER_STR("SoftwareLowCPU"), - QString(SIMPLE_ENCODER_X264_LOWCPU)); + if (EncoderAvailable("obs_x264")) { + ui->simpleOutRecEncoder->addItem( + ENCODER_STR("Software"), + QString(SIMPLE_ENCODER_X264)); + ui->simpleOutRecEncoder->addItem( + ENCODER_STR("SoftwareLowCPU"), + QString(SIMPLE_ENCODER_X264_LOWCPU)); + } if (EncoderAvailable("obs_qsv11")) ui->simpleOutRecEncoder->addItem( ENCODER_STR("Hardware.QSV.H264"), diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt index 196c5ab7a..e752c29ac 100644 --- a/plugins/obs-x264/CMakeLists.txt +++ b/plugins/obs-x264/CMakeLists.txt @@ -1,5 +1,11 @@ cmake_minimum_required(VERSION 3.22...3.25) +option(ENABLE_X264 "Enable x264 support" ON) +if(NOT ENABLE_X264) + obs_status(DISABLED "obs-x264") + return() +endif() + legacy_check() find_package(Libx264 REQUIRED)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor