Commit c9f1d694 authored by Till Theato's avatar Till Theato

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
parent 21a6715f
......@@ -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).
......
......@@ -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">
......
......@@ -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());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment