Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-11-10 08:34:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #384 from rosenbjerg/chore/fixes

Browse source 
Minor fixes

Former-commit-id: b8d1c26f4f
This commit is contained in:
Malte Rosenbjerg 2023-01-31 23:16:23 +01:00 committed by GitHub
commit 5ebe0bb71d
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/ci.yml vendored
View file

@ -15,8 +15,8 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [windows-latest, ubuntu-latest] os: [windows-latest, ubuntu-latest, macos-latest]
timeout-minutes: 6 timeout-minutes: 7
steps: steps:
- name: Checkout - name: Checkout
@ -28,10 +28,9 @@ jobs:
dotnet-version: '7.0.x' dotnet-version: '7.0.x'
- name: Prepare FFMpeg - name: Prepare FFMpeg
uses: Iamshankhadeep/setup-ffmpeg@v1.2 uses: FedericoCarboni/setup-ffmpeg@v2
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
version: "4.4"
- name: Test with dotnet - name: Test with dotnet
run: dotnet test FFMpegCore.sln --logger GitHubActions run: dotnet test FFMpegCore.sln --logger GitHubActions

4
FFMpegCore/FFMpeg/Pipes/PipeHelpers.cs
View file

@ -12,9 +12,7 @@ public static string GetPipePath(string pipeName)
{ {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
return $@"\\.\pipe\{pipeName}"; return $@"\\.\pipe\{pipeName}";
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) return $"unix:{Path.Combine(Path.GetTempPath(), $"CoreFxPipe_{pipeName}")}";
return $"unix:{Path.GetTempPath()}/CoreFxPipe_{pipeName}";
return $"unix:/tmp/CoreFxPipe_{pipeName}";
} }
} }
} }

2
LICENSE
View file

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) 2022 Vlad Jerca Copyright (c) 2023 Vlad Jerca
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

2
README.md
View file

@ -231,6 +231,6 @@ Older versions of ffmpeg might not support all ffmpeg arguments available throug
### License ### License
Copyright © 2021 Copyright © 2023
Released under [MIT license](https://github.com/rosenbjerg/FFMpegCore/blob/master/LICENSE) Released under [MIT license](https://github.com/rosenbjerg/FFMpegCore/blob/master/LICENSE)