]> git.sesse.net Git - kdenlive/commitdiff
MLT now seems to correctly handle the "out" property so that we can make a clip longe...
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 10 May 2011 19:32:52 +0000 (19:32 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 10 May 2011 19:32:52 +0000 (19:32 +0000)
svn path=/trunk/kdenlive/; revision=5584

src/renderer.cpp

index bfaa2f107da61b72478d9a9893043c22c5a54751..7331d4526126385b538f2fffba713da2a3b00b69 100644 (file)
@@ -607,11 +607,14 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         return;
     }
 
-    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 (proxyProducer && xml.hasAttribute("proxy_out")) {
+        producer->set("out", xml.attribute("proxy_out").toInt());
+        if (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")) {