Find better FFmpeg path

And set to a function for better readability
pH7Software · Feb 7, 2016 · 4716439 · 4716439
1 parent 1a3d6f3
commit 4716439
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/_install/controllers/InstallController.php b/_install/controllers/InstallController.php
@@ -141,7 +141,7 @@ public function config_system ()
                 $_SESSION['db']['charset'] = 'UTF8';
 
                 $_SESSION['val']['bug_report_email'] = '';
-                $_SESSION['val']['ffmpeg_path'] = (is_windows() ? 'C:\ffmpeg\ffmpeg.exe' : (is_file('/usr/local/bin/ffmpeg') ? '/usr/local/bin/ffmpeg' : '/usr/bin/ffmpeg'));
+                $_SESSION['val']['ffmpeg_path'] = ffmpeg_path();
             }
 
             if ($_SERVER['REQUEST_METHOD'] == 'POST' && !empty($_POST['config_system_submit']))

diff --git a/_install/inc/fns/misc.php b/_install/inc/fns/misc.php
@@ -277,6 +277,21 @@ function generate_hash($iLength = 80)
     return substr(hash('whirlpool', time() . hash('sha512', getenv('REMOTE_ADDR') . uniqid(mt_rand(), true) . microtime(true)*999999999999)), 0, $iLength);
 }
 
+/**
+ * Try to find and get the FFmpeg path if it is installed (note I don't use system command like "which ffmpeg" for portability reason).
+ *
+ * @return string The appropriate FFmpeg path.
+ */
+function ffmpeg_path()
+{
+    if (is_windows())
+        $sPath = (is_file('C:\ffmpeg\bin\ffmpeg.exe')) ? 'C:\ffmpeg\bin\ffmpeg.exe' : 'C:\ffmpeg\ffmpeg.exe';
+    else
+        $sPath = (is_file('/usr/local/bin/ffmpeg')) ? '/usr/local/bin/ffmpeg' : '/usr/bin/ffmpeg';
+
+    return $sPath;
+}
+
 /**
  * Check if Apache's mod_rewrite is installed.
  *