diff --git a/Directory.Packages.props b/Directory.Packages.props index f1d7cac61..1004157d0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,7 +39,6 @@ - diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavcodec.so.59 b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavcodec.so.59 new file mode 100644 index 000000000..75a371a53 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavcodec.so.59 differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavutil.so.57 b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavutil.so.57 new file mode 100644 index 000000000..e8dcaa700 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-arm64/libavutil.so.57 differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavcodec.so.59 b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavcodec.so.59 new file mode 100644 index 000000000..585835715 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavcodec.so.59 differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavutil.so.57 b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavutil.so.57 new file mode 100644 index 000000000..f962b66e2 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/linux-x64/libavutil.so.57 differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavcodec.59.dylib b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavcodec.59.dylib new file mode 100644 index 000000000..047879bf0 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavcodec.59.dylib differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavutil.57.dylib b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavutil.57.dylib new file mode 100644 index 000000000..abef3888c Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-arm64/libavutil.57.dylib differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavcodec.59.dylib b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavcodec.59.dylib new file mode 100644 index 000000000..5d4be8f3f Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavcodec.59.dylib differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavutil.57.dylib b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavutil.57.dylib new file mode 100644 index 000000000..abf777430 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/osx-x64/libavutil.57.dylib differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avcodec-59.dll b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avcodec-59.dll new file mode 100644 index 000000000..3f17f1ef6 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avcodec-59.dll differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avutil-57.dll b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avutil-57.dll new file mode 100644 index 000000000..6917608c1 Binary files /dev/null and b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Library/win-x64/avutil-57.dll differ diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs index c31d3034e..0c7bfecd4 100644 --- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs +++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs @@ -10,6 +10,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native public const string AvCodecLibraryName = "avcodec"; public const string AvUtilLibraryName = "avutil"; + // Library Name, Min Version, Max Version. private static readonly Dictionary _librariesWhitelist = new() { { AvCodecLibraryName, (58, 59) }, diff --git a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj index 9e250d171..69ec7f3dc 100644 --- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj +++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj @@ -3,6 +3,7 @@ true $(DefaultItemExcludes);._* + win-x64;osx-x64;osx-arm64;linux-x64;linux-arm64 @@ -10,4 +11,31 @@ + + + Always + %(Filename)%(Extension) + + + + Always + %(Filename)%(Extension) + + + + Always + %(Filename)%(Extension) + + + + Always + %(Filename)%(Extension) + + + + Always + %(Filename)%(Extension) + + + diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj index 174aadeb0..0a9baec2b 100644 --- a/src/Ryujinx/Ryujinx.csproj +++ b/src/Ryujinx/Ryujinx.csproj @@ -58,7 +58,6 @@ -