move ffmpeg to dll subdirectory

This commit is contained in:
goyuken 2012-10-09 21:25:58 +00:00
parent 07463fbdc5
commit da92c276a4
4 changed files with 6 additions and 2 deletions

View File

@ -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);

View File

@ -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;