From 2f79e3271dc7b92988482c5099656a83b6148d91 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Mon, 25 Jun 2018 23:39:06 +1000 Subject: [PATCH] Prefer ffmpeg if it is installed --- common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.py b/common.py index f0f827b..0fe6583 100644 --- 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 -- 2.39.2