Fix proxy and various other things when using libav instead of ffmpeg

[kdenlive] / src / cliptranscode.cpp

diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp
index 863db131830e95ed72c835d8943459c7c7f74c7d..42a3a6ca5e2763c8e62b757dc33cf0aa7caaf630 100644 (file)
--- a/src/cliptranscode.cpp
+++ b/src/cliptranscode.cpp
@@ -19,6 +19,7 @@
 
 
 #include "cliptranscode.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KGlobalSettings>
@@ -79,7 +80,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QStri
         QMapIterator<QString, QString> i(profiles);
         while (i.hasNext()) {
             i.next();
-            QStringList data = i.value().split(";", QString::SkipEmptyParts);
+            QStringList data = i.value().split(';');
             profile_list->addItem(i.key(), data.at(0));
             if (data.count() > 1) profile_list->setItemData(profile_list->count() - 1, data.at(1), Qt::UserRole + 1);
         }
@@ -92,6 +93,8 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QStri
     m_transcodeProcess.setProcessChannelMode(QProcess::MergedChannels);
     connect(&m_transcodeProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowTranscodeInfo()));
     connect(&m_transcodeProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotTranscodeFinished(int, QProcess::ExitStatus)));
+    
+    ffmpeg_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
 
     adjustSize();
 }
@@ -143,7 +146,7 @@ void ClipTranscode::slotStartTransCode()
     buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Abort"));
 
     m_destination = destination + extension;
-    m_transcodeProcess.start("ffmpeg", parameters);
+    m_transcodeProcess.start(KdenliveSettings::ffmpegpath(), parameters);
     source_url->setEnabled(false);
     dest_url->setEnabled(false);
     button_start->setEnabled(false);