Merge master into sdl-audio

ppy · Oct 14, 2023 · e463fb3 · e463fb3
2 parents da56736 + e267c22
commit e463fb3
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -69,8 +69,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get upgrade
-          sudo apt-get install -y make nasm gcc mingw-w64
+          sudo apt-get update
+          sudo apt-get install nasm mingw-w64
 
       - name: Build
         run: osu.Framework.NativeLibs/scripts/ffmpeg/build-win.sh
@@ -111,8 +111,8 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          sudo apt-get update && sudo apt-get upgrade
-          sudo apt-get install -y git curl gcc make nasm pkg-config libva-dev libvdpau-dev
+          sudo apt-get update
+          sudo apt-get install nasm libva-dev libvdpau-dev
 
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavcodec.so b/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavcodec.so
diff --git a/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavformat.so b/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavformat.so
diff --git a/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavutil.so b/osu.Framework.NativeLibs/runtimes/linux-x64/native/libavutil.so
diff --git a/osu.Framework.NativeLibs/runtimes/linux-x64/native/libswscale.so b/osu.Framework.NativeLibs/runtimes/linux-x64/native/libswscale.so
diff --git a/osu.Framework.NativeLibs/runtimes/osx/native/libavcodec.58.dylib b/osu.Framework.NativeLibs/runtimes/osx/native/libavcodec.58.dylib
diff --git a/osu.Framework.NativeLibs/runtimes/osx/native/libavformat.58.dylib b/osu.Framework.NativeLibs/runtimes/osx/native/libavformat.58.dylib
diff --git a/osu.Framework.NativeLibs/runtimes/osx/native/libavutil.56.dylib b/osu.Framework.NativeLibs/runtimes/osx/native/libavutil.56.dylib
diff --git a/osu.Framework.NativeLibs/runtimes/osx/native/libswscale.5.dylib b/osu.Framework.NativeLibs/runtimes/osx/native/libswscale.5.dylib
diff --git a/osu.Framework.NativeLibs/runtimes/win-arm64/native/avcodec-58.dll b/osu.Framework.NativeLibs/runtimes/win-arm64/native/avcodec-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-arm64/native/avformat-58.dll b/osu.Framework.NativeLibs/runtimes/win-arm64/native/avformat-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-arm64/native/avutil-56.dll b/osu.Framework.NativeLibs/runtimes/win-arm64/native/avutil-56.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-arm64/native/swscale-5.dll b/osu.Framework.NativeLibs/runtimes/win-arm64/native/swscale-5.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x64/native/avcodec-58.dll b/osu.Framework.NativeLibs/runtimes/win-x64/native/avcodec-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x64/native/avformat-58.dll b/osu.Framework.NativeLibs/runtimes/win-x64/native/avformat-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x64/native/avutil-56.dll b/osu.Framework.NativeLibs/runtimes/win-x64/native/avutil-56.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x64/native/swscale-5.dll b/osu.Framework.NativeLibs/runtimes/win-x64/native/swscale-5.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x86/native/avcodec-58.dll b/osu.Framework.NativeLibs/runtimes/win-x86/native/avcodec-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x86/native/avformat-58.dll b/osu.Framework.NativeLibs/runtimes/win-x86/native/avformat-58.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x86/native/avutil-56.dll b/osu.Framework.NativeLibs/runtimes/win-x86/native/avutil-56.dll
diff --git a/osu.Framework.NativeLibs/runtimes/win-x86/native/swscale-5.dll b/osu.Framework.NativeLibs/runtimes/win-x86/native/swscale-5.dll
diff --git a/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh b/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh
@@ -18,8 +18,8 @@ FFMPEG_FLAGS=(
 
     # File and video formats
     --enable-demuxer='mov,matroska,flv,avi' # mov = mp4, matroska = mkv & webm
-    --enable-parser='h264,hevc,vp8,vp9'
-    --enable-decoder='h264,hevc,vp8,vp9'
+    --enable-parser='mpeg4video,h264,hevc,vp8,vp9'
+    --enable-decoder='flv,mpeg4,h264,hevc,vp8,vp9'
     --enable-protocol=pipe
 )
 

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
@@ -45,7 +45,7 @@
 
     <!-- DO NOT use ProjectReference for native packaging project.
          See https://github.com/NuGet/Home/issues/4514 and https://github.com/dotnet/sdk/issues/765 . -->
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2023.1004.1-nativelibs" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2023.1013.0-nativelibs" />
 
     <!-- Any version ahead of this will cause AOT issues with iOS
          See https://github.com/mono/mono/issues/21188 -->