|
|
@@ -898,7 +898,7 @@ void OBSBasicSettings::LoadFormats()
|
|
|
audio ? AUDIO_STR : VIDEO_STR);
|
|
|
|
|
|
ui->advOutFFFormat->addItem(
|
|
|
- itemText, qVariantFromValue(formatDesc));
|
|
|
+ itemText, QVariant::fromValue(formatDesc));
|
|
|
}
|
|
|
|
|
|
format = ff_format_desc_next(format);
|
|
|
@@ -921,7 +921,7 @@ static void AddCodec(QComboBox *combo, const ff_codec_desc *codec_desc)
|
|
|
CodecDesc cd(ff_codec_desc_name(codec_desc),
|
|
|
ff_codec_desc_id(codec_desc));
|
|
|
|
|
|
- combo->addItem(itemText, qVariantFromValue(cd));
|
|
|
+ combo->addItem(itemText, QVariant::fromValue(cd));
|
|
|
}
|
|
|
|
|
|
#define AV_ENCODER_DEFAULT_STR \
|
|
|
@@ -937,7 +937,7 @@ static void AddDefaultCodec(QComboBox *combo, const ff_format_desc *formatDesc,
|
|
|
combo->removeItem(existingIdx);
|
|
|
|
|
|
combo->addItem(QString("%1 (%2)").arg(cd.name, AV_ENCODER_DEFAULT_STR),
|
|
|
- qVariantFromValue(cd));
|
|
|
+ QVariant::fromValue(cd));
|
|
|
}
|
|
|
|
|
|
#define AV_ENCODER_DISABLE_STR \
|
|
|
@@ -984,7 +984,7 @@ void OBSBasicSettings::ReloadCodecs(const ff_format_desc *formatDesc)
|
|
|
ui->advOutFFAEncoder->model()->sort(0);
|
|
|
ui->advOutFFVEncoder->model()->sort(0);
|
|
|
|
|
|
- QVariant disable = qVariantFromValue(CodecDesc());
|
|
|
+ QVariant disable = QVariant::fromValue(CodecDesc());
|
|
|
|
|
|
ui->advOutFFAEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
|
|
|
ui->advOutFFVEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
|