X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=9edc697aa1821c4e4dd3850a72ba85973b47650b;hb=193e14dd6e4c0be842951f43641a82aa81768d2e;hp=68ed54592c38b6bba386bc3a5076ee89538d0655;hpb=12b5cd682d1d614c9a21a73f9d07b8502b6de4b9;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 68ed5459..9edc697a 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -610,6 +610,8 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int if (proxyProducer && xml.hasAttribute("proxy_out") && producer->get_out() != xml.attribute("proxy_out").toInt()) { // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip emit removeInvalidProxy(clipId, true); + delete producer; + return; } if (xml.hasAttribute("force_aspect_ratio")) { @@ -1645,7 +1647,7 @@ Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { - slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", url.toUtf8().constData()); + slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); QString id = prod->get("id"); if (id.contains('_')) id = id.section('_', 0, 0);