Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2025-12-14 01:55:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/yuqian5/FFMpegCore into pr/442

Browse source
This commit is contained in:
Malte Rosenbjerg 2025-10-17 15:22:42 +02:00
commit bbdbe5592a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FFMpegCore.Test/Utilities/OsSpecificTestMethod.cs
View file

@ -7,9 +7,9 @@ namespace FFMpegCore.Test.Utilities;
[Flags] [Flags]
internal enum OsPlatforms : ushort internal enum OsPlatforms : ushort
{ {
Windows, Windows = 1,
Linux, Linux = 2,
MacOS MacOS = 4
} }
internal class OsSpecificTestMethod : TestMethodAttribute internal class OsSpecificTestMethod : TestMethodAttribute

2
README.md
View file

@ -187,7 +187,7 @@ If you want to use `System.Drawing.Bitmap`s as `IVideoFrame`s, a `BitmapVideoFra
## Runtime Auto Installation ## Runtime Auto Installation
You can install a version of ffmpeg suite at runtime using `FFMpegDownloader.DownloadFFMpegSuite();` You can install a version of ffmpeg suite at runtime using `FFMpegDownloader.DownloadFFMpegSuite();`
This feature uses the api from [ffbinaries](https://ffbinaries.com/api). This feature uses the api from [ffbinaries](https://ffbinaries.com/api).
## Manual Installation ## Manual Installation