Browse Source

Fixed macos ffmpeg path missing

Krzysztof Krysiński 4 weeks ago
parent
commit
2e15b41989

+ 1 - 1
src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs

@@ -24,7 +24,7 @@ public class FFMpegRenderer : IAnimationRenderer
     {
     {
         string path = $"ThirdParty/{IOperatingSystem.Current.Name}/ffmpeg";
         string path = $"ThirdParty/{IOperatingSystem.Current.Name}/ffmpeg";
 
 
-        string binaryPath = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), path);
+        string binaryPath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), path);
 
 
         GlobalFFOptions.Configure(new FFOptions() { BinaryFolder = binaryPath });
         GlobalFFOptions.Configure(new FFOptions() { BinaryFolder = binaryPath });
 
 

+ 2 - 2
src/PixiEditor.AnimationRenderer.FFmpeg/PixiEditor.AnimationRenderer.FFmpeg.csproj

@@ -32,13 +32,13 @@
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-x64'">
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-x64'">
-    <Content Include="ThirdParty\MacOS\ffmpeg\**">
+    <Content Include="ThirdParty/MacOS/ffmpeg/**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
-    <Content Include="ThirdParty\MacOS\ffmpeg\**">
+    <Content Include="ThirdParty/MacOS/ffmpeg/**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>