From da92c276a4cd068630e094768568cb125f0269e3 Mon Sep 17 00:00:00 2001 From: goyuken Date: Tue, 9 Oct 2012 21:25:58 +0000 Subject: [PATCH] move ffmpeg to dll subdirectory --- BizHawk.MultiClient/AVOut/FFmpegWriter.cs | 6 +++++- BizHawk.MultiClient/Config.cs | 2 +- BizHawk.MultiClient/output/{ => dll}/ffmpeg.exe | Bin .../output/{ => dll}/ffmpeg_readme.txt | 0 4 files changed, 6 insertions(+), 2 deletions(-) rename BizHawk.MultiClient/output/{ => dll}/ffmpeg.exe (100%) mode change 100755 => 100644 rename BizHawk.MultiClient/output/{ => dll}/ffmpeg_readme.txt (100%) diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs index 38916a629f..3b50dc3ef7 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs @@ -73,7 +73,11 @@ namespace BizHawk.MultiClient void OpenFileSegment() { ffmpeg = new Process(); - ffmpeg.StartInfo.FileName = "ffmpeg"; +#if WINDOWS + ffmpeg.StartInfo.FileName = System.IO.Path.Combine(PathManager.GetBasePathAbsolute(), "dll", "ffmpeg.exe"); +#else + ffmpeg.StartInfo.FileName = "ffmpeg"; // expecting native version to be in path +#endif string filename = String.Format("{0}_{1,4:D4}{2}", baseName, segment, ext); diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index ae26f81d72..5de8179fb8 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -155,7 +155,7 @@ namespace BizHawk.MultiClient public string PathINTVGROM = Path.Combine(".", "grom.bin"); public string PathINTVEROM = Path.Combine(".", "erom.bin"); - public string FFMpegPath = "%exe%/ffmpeg.exe"; + public string FFMpegPath = "%exe%/dll/ffmpeg.exe"; // General Client Settings public bool StackOSDMessages = true; diff --git a/BizHawk.MultiClient/output/ffmpeg.exe b/BizHawk.MultiClient/output/dll/ffmpeg.exe old mode 100755 new mode 100644 similarity index 100% rename from BizHawk.MultiClient/output/ffmpeg.exe rename to BizHawk.MultiClient/output/dll/ffmpeg.exe diff --git a/BizHawk.MultiClient/output/ffmpeg_readme.txt b/BizHawk.MultiClient/output/dll/ffmpeg_readme.txt similarity index 100% rename from BizHawk.MultiClient/output/ffmpeg_readme.txt rename to BizHawk.MultiClient/output/dll/ffmpeg_readme.txt