Merge branch 'main' into main

rosenbjerg · Oct 5, 2023 · 21c02ba · 21c02ba
2 parents ed30b14 + d30629f
commit 21c02ba
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/FFMpegCore/GlobalFFOptions.cs b/FFMpegCore/GlobalFFOptions.cs
@@ -30,12 +30,23 @@ private static string GetFFBinaryPath(string name, FFOptions ffOptions)
             }
 
             var target = Environment.Is64BitProcess ? "x64" : "x86";
-            if (Directory.Exists(Path.Combine(ffOptions.BinaryFolder, target)))
+            var possiblePaths = new List<string>()
             {
-                ffName = Path.Combine(target, ffName);
+                Path.Combine(ffOptions.BinaryFolder, target),
+                ffOptions.BinaryFolder
+            };
+
+            foreach (var possiblePath in possiblePaths)
+            {
+                var possibleFFMpegPath = Path.Combine(possiblePath, ffName);
+                if (File.Exists(possibleFFMpegPath))
+                {
+                    return possibleFFMpegPath;
+                }
             }
 
-            return Path.Combine(ffOptions.BinaryFolder, ffName);
+            //Fall back to the assumption this tool exists in the PATH
+            return ffName;
         }
 
         private static FFOptions LoadFFOptions()