UI: Don't display x264 warning if using hardware
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:
parent
350855a2e7
commit
5429832675
1 changed files with 3 additions and 2 deletions
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue