diff --git a/app/codec/ffmpeg/ffmpegencoder.cpp b/app/codec/ffmpeg/ffmpegencoder.cpp index d5360390d..81c2a510a 100644 --- a/app/codec/ffmpeg/ffmpegencoder.cpp +++ b/app/codec/ffmpeg/ffmpegencoder.cpp @@ -610,7 +610,7 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV } if (encoder->type != type) { - SetError(tr("Retrieved unexpected codec type %1 for codec %2").arg(QString::number(encoder->type), codec)); + SetError(tr("Retrieved unexpected codec type %1 for codec %2").arg(QString::number(encoder->type), QString::number(codec))); return false; } diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp index d98935e01..5bdeeaec9 100644 --- a/app/dialog/export/export.cpp +++ b/app/dialog/export/export.cpp @@ -632,6 +632,7 @@ void ExportDialog::SetDefaults() audio_tab_->sample_format_combobox()->SetAttemptToRestoreFormat(false); audio_tab_->channel_layout_combobox()->SetChannelLayout(ap.channel_layout()); subtitles_enabled_->setChecked(SequenceHasSubtitles()); + subtitle_tab_->SetSidecarFormat(ExportFormat::kFormatSRT); } EncodingParams ExportDialog::GenerateParams() const diff --git a/app/dialog/export/exportsubtitlestab.cpp b/app/dialog/export/exportsubtitlestab.cpp index 330942810..5817e9958 100644 --- a/app/dialog/export/exportsubtitlestab.cpp +++ b/app/dialog/export/exportsubtitlestab.cpp @@ -24,7 +24,7 @@ ExportSubtitlesTab::ExportSubtitlesTab(QWidget *parent) : layout->addWidget(sidecar_format_label_, row, 0); sidecar_format_combobox_ = new ExportFormatComboBox(ExportFormatComboBox::kShowSubtitlesOnly); - sidecar_format_combobox_->setVisible(false); + sidecar_format_combobox_->setVisible(true); layout->addWidget(sidecar_format_combobox_, row, 1); row++; @@ -42,10 +42,20 @@ ExportSubtitlesTab::ExportSubtitlesTab(QWidget *parent) : int ExportSubtitlesTab::SetFormat(ExportFormat::Format format) { + auto vcodecs = ExportFormat::GetVideoCodecs(format); + auto acodecs = ExportFormat::GetAudioCodecs(format); + auto scodecs = ExportFormat::GetSubtitleCodecs(format); - sidecar_checkbox_->setChecked(scodecs.empty()); - sidecar_checkbox_->setEnabled(!scodecs.empty()); + if (!scodecs.empty() && vcodecs.empty() && acodecs.empty()) { + // If format supports ONLY scodecs, default this to off and disable it + sidecar_checkbox_->setChecked(false); + sidecar_checkbox_->setEnabled(false); + } else { + // If format does not support scodecs, default this to checked and disable it + sidecar_checkbox_->setChecked(scodecs.empty()); + sidecar_checkbox_->setEnabled(!scodecs.empty()); + } scodecs = ExportFormat::GetSubtitleCodecs(sidecar_format_combobox_->GetFormat());