Prefer ffmpeg if it is installed

[webdl] / common.py

diff --git a/common.py b/common.py
index f0f827bcd4e13e5e4801302e4199fa0f79c6e91b..0fe65839145bba0c435360e10cde7e6292ca29b0 100644 (file)
--- a/common.py
+++ b/common.py
@@ -149,14 +149,14 @@ def check_command_exists(cmd):
         return False
 
 def find_ffmpeg():
-    for ffmpeg in ["avconv", "ffmpeg"]:
+    for ffmpeg in ["ffmpeg", "avconv"]:
         if check_command_exists([ffmpeg, "--help"]):
             return ffmpeg
 
     raise Exception("You must install ffmpeg or libav-tools")
 
 def find_ffprobe():
-    for ffprobe in ["avprobe", "ffprobe"]:
+    for ffprobe in ["ffprobe", "avprobe"]:
         if check_command_exists([ffprobe, "--help"]):
             return ffprobe