瀏覽代碼

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
jp9000 9 年之前
父節點
當前提交
5429832675
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      obs/window-basic-settings.cpp

+ 3 - 2
obs/window-basic-settings.cpp

@@ -3271,9 +3271,10 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
 		QString enc = ui->simpleOutRecEncoder->currentData().toString();
 		QString enc = ui->simpleOutRecEncoder->currentData().toString();
 		QString streamEnc =
 		QString streamEnc =
 			ui->simpleOutStrEncoder->currentData().toString();
 			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())
 			if (!warning.isEmpty())
 				warning += "\n\n";
 				warning += "\n\n";
 			warning += SIMPLE_OUTPUT_WARNING("Encoder");
 			warning += SIMPLE_OUTPUT_WARNING("Encoder");