Merge pull request #6024 from FreezyLemon/ffmpeg-add-mpeg4-support

FFmpeg: Enable MPEG-4 parser and decoder
ppy · Oct 13, 2023 · cfd542e · cfd542e
2 parents ba72c19 + 05d4bf7
commit cfd542e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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/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
 )