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

[kdenlive] / src / kdenlivesettings.kcfg

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index ea681bce728d794524cf70c59f205a5e7f977d94..0a3bbaa50e7fc3ff2427ae5aa8306f2824b61b0a 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -155,11 +155,6 @@
       <default>true</default>
     </entry>
 
-    <entry name="enableaudioalign" type="Bool">
-      <label>Enable automatic audio alignment (experimental)</label>
-      <default>false</default>
-    </entry>
-
     <entry name="verticalzoom" type="Bool">
       <label>Vertical drag in timeline ruler zooms.</label>
       <default>false</default>
@@ -248,6 +243,16 @@
       <default></default>
     </entry>
 
+    <entry name="ffmpegpath" type="Path">
+      <label>FFmpeg / Libav binary path.</label>
+      <default></default>
+    </entry>
+
+    <entry name="ffplaypath" type="Path">
+      <label>FFplay / avplay binary path.</label>
+      <default></default>
+    </entry>
+    
     <entry name="mltthreads" type="Int">
       <label>Mlt processing thread count.</label>
       <default>1</default>
@@ -501,6 +506,11 @@
       <label>Additionnal dvgrab parameters.</label>
       <default></default>
     </entry>
+
+    <entry name="decklink_device_found" type="Bool">
+      <label>Enable Blackmagic decklink support.</label>
+      <default>true</default>
+    </entry>
     
     <entry name="decklink_capturedevice" type="UInt">
       <label>default HDMI capture device.</label>