jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Don't display x264 warning if using hardware

Browse Source 
Don't display the warning for using two software encoders at the same
time if the stream encoder is not x264
This commit is contained in:
jp9000 2016-04-23 16:26:33 -07:00
parent 350855a2e7
commit 5429832675
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
obs/window-basic-settings.cpp
View File

@ -3271,9 +3271,10 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
QString enc = ui->simpleOutRecEncoder->currentData().toString();
QString streamEnc =
ui->simpleOutStrEncoder->currentData().toString();
bool x264RecEnc = (enc == SIMPLE_ENCODER_X264 ||
enc == SIMPLE_ENCODER_X264_LOWCPU);
if (enc == SIMPLE_ENCODER_X264 ||
enc == SIMPLE_ENCODER_X264_LOWCPU) {
if (streamEnc == SIMPLE_ENCODER_X264 && x264RecEnc) {
if (!warning.isEmpty())
warning += "\n\n";
warning += SIMPLE_OUTPUT_WARNING("Encoder");