move ffmpeg to dll subdirectory
This commit is contained in:
parent
07463fbdc5
commit
da92c276a4
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
0
BizHawk.MultiClient/output/ffmpeg.exe → BizHawk.MultiClient/output/dll/ffmpeg.exe
Executable file → Normal file
0
BizHawk.MultiClient/output/ffmpeg.exe → BizHawk.MultiClient/output/dll/ffmpeg.exe
Executable file → Normal file
Loading…
Reference in New Issue