KisDlgAnimationRenderer.cpp (krita-5.1.3.tar.xz) | : | KisDlgAnimationRenderer.cpp (krita-5.1.4.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 369 | skipping to change at line 369 | |||
ffmpegWarningCheck(); | ffmpegWarningCheck(); | |||
QString videoFileName = defaultVideoFileName(m_doc, mimeType); | QString videoFileName = defaultVideoFileName(m_doc, mimeType); | |||
if (!m_page->videoFilename->fileName().isEmpty()) { | if (!m_page->videoFilename->fileName().isEmpty()) { | |||
const QFileInfo info = QFileInfo(m_page->videoFilename->fileName()); | const QFileInfo info = QFileInfo(m_page->videoFilename->fileName()); | |||
const QString baseName = info.completeBaseName(); | const QString baseName = info.completeBaseName(); | |||
const QString path = info.path(); | const QString path = info.path(); | |||
videoFileName = | videoFileName = QString("%1%2%3.%4") | |||
QString("%1%2%3.%4").arg(path).arg('/').arg(baseName).arg(KisMimeDat | .arg(path, "/", baseName, KisMimeDatabase::suffixesF | |||
abase::suffixesForMimeType(mimeType).first()); | orMimeType(mimeType).first()); | |||
} | } | |||
m_page->videoFilename->setMimeTypeFilters(QStringList() << mimeType, mimeTyp e); | m_page->videoFilename->setMimeTypeFilters(QStringList() << mimeType, mimeTyp e); | |||
m_page->videoFilename->setFileName(videoFileName); | m_page->videoFilename->setFileName(videoFileName); | |||
m_wantsRenderWithHDR = (mimeType == "video/mp4") ? m_wantsRenderWithHDR : fa lse; | m_wantsRenderWithHDR = (mimeType == "video/mp4") ? m_wantsRenderWithHDR : fa lse; | |||
{ // We've got to reload the render settings to account for the user chang ing render type without configuration. | { // We've got to reload the render settings to account for the user chang ing render type without configuration. | |||
// If this is removed from the configuration, ogg vorbis can fail to ren der on first attempt. BUG:421658 | // If this is removed from the configuration, ogg vorbis can fail to ren der on first attempt. BUG:421658 | |||
// This should be revisited at some point, too much configuration juggli ng in this class makes it error-prone... | // This should be revisited at some point, too much configuration juggli ng in this class makes it error-prone... | |||
End of changes. 1 change blocks. | ||||
4 lines changed or deleted | 3 lines changed or added |