Disable threads option for rendering Flash.

The Flash encoder does not work with more than one thread:
http://www.kdenlive.org/mantis/view.php?id=2312

svn path=/trunk/kdenlive/; revision=5915

diff --git a/CHANGELOG b/CHANGELOG
index 4538fa5e9fa54b59539ddab9a62da8530e28578c..6413f9a194a113317795319e30dceeb635ca5046 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ HEAD
     * Allow use of different ffmpeg preset for 1st and 2nd render pass.
     * Notes widget: context menu now allows to insert clickable timecode to make easy reference to some place in the project.
 
+    * Fix rendering to Flash could be broken by setting the number of encoder threads. (http://www.kdenlive.org/mantis/view.php?id=2312)
     * Fix DVD wizard losing chapters data when switching to menu page.
     * Fix previewing of affine transitions with transparent png.
     * Fix timeline corruption when using 'Remove space' tool (transitions could overlap).

diff --git a/export/profiles.xml b/export/profiles.xml
index c91281b8ea0b7c36a8a84136242e5aade19218fb..ae84a9e4c3966d0a54d0d366c8a3e35f1f21cc0b 100644 (file)
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -70,9 +70,9 @@
 
 <group name="Flash" renderer="avformat" extension="flv" type="av">
   <profile name="Flash" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000" defaultbitrate="8000"
-           args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=%bitrate+'k' progressive=1 pass=%passes" />
-  <profile name="Flash 720x576" standard="PAL" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=12000k s=720x576 progressive=1 pass=%passes" />
-  <profile name="Flash 720x480" standard="NTSC" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=12000k s=720x480 progressive=1 pass=%passes" />
+           args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=%bitrate+'k' progressive=1 pass=%passes threads=1" />
+  <profile name="Flash 720x576" standard="PAL" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=12000k s=720x576 progressive=1 pass=%passes threads=1" />
+  <profile name="Flash 720x480" standard="NTSC" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=12000k s=720x480 progressive=1 pass=%passes threads=1" />
 </group>
 
 <group name="RealVideo" renderer="avformat" extension="rm" type="av">

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 65992b4aecf51f167798d10a8b4d1139589755d8..1c3650205ac567336711dc84f4203498d9a59966 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -780,7 +780,9 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
     if (!exportAudio) renderArgs.append(" an=1 ");
 
     // Set the thread counts
-    renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
+    if (!renderArgs.contains("threads=")) {
+        renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
+    }
     renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads()));
 
     // Check if the rendering profile is different from project profile,
@@ -1269,6 +1271,8 @@ void RenderWidget::refreshParams()
 
     m_view.checkTwoPass->setEnabled(params.contains("passes"));
 
+    m_view.encoder_threads->setEnabled(!params.contains("threads="));
+
     m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty());
     m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty());
 }