[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=0fbbb37

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 0fbbb37f278b351e08c44911ec4d8be5e44491ec
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Mon Dec 21 12:44:55 2015 +0000

    * Add upstream patch 01-render-with-rescale-changes-fps: Fix resizing on
      render ressetting frame rate to default 25.
      Closes: #807684
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6459 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                                       |  3 +++
 patches/01-render-with-rescale-changes-fps.diff | 24 ++++++++++++++++++++++++
 patches/series                                  |  1 +
 3 files changed, 28 insertions(+)

diff --git a/changelog b/changelog
index e75db28..c7314c6 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ kdenlive (15.12.0-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Fixes crash when deleting tracks.
       Closes: #807978
+  * Add upstream patch 01-render-with-rescale-changes-fps: Fix resizing on
+    render ressetting frame rate to default 25.
+    Closes: #807684
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 21 Dec 2015 13:38:03 +0100
 
diff --git a/patches/01-render-with-rescale-changes-fps.diff b/patches/01-render-with-rescale-changes-fps.diff
new file mode 100644
index 0000000..e1715b5
--- /dev/null
+++ b/patches/01-render-with-rescale-changes-fps.diff
@@ -0,0 +1,24 @@
+commit caf513092be17d72a7117d7dc6d60826728a1b81
+Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
+Date:   Wed Dec 16 19:19:30 2015 +0100
+
+    Fix resizing on render ressetting frame rate to default 25
+
+diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
+index f7314cc..918753f 100644
+--- a/renderer/renderjob.cpp
++++ b/renderer/renderjob.cpp
+@@ -66,11 +66,10 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString& rend
+     if (out != -1) m_args << QLatin1String("out=") + QString::number(out);
+     m_args << preargs;
+     if (scenelist.startsWith(QLatin1String("consumer:"))) {
+-        // Use MLT's producer_consumer, needs a different syntax for profile:
++        // Use MLT's producer_consumer, safer to pass profile in an explicit way
+         m_args << QLatin1String("profile=") + profile;
+-    } else {
+-        m_args << QLatin1String("-profile") << profile;
+     }
++    m_args << QLatin1String("-profile") << profile;
+     m_args << QLatin1String("-consumer") << rendermodule + QLatin1Char(':') + m_dest
+            << QLatin1String("progress=1") << args;
+ 
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..cdc7eb7
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+01-render-with-rescale-changes-fps.diff

-- 
kdenlive packaging