Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FFmpeg: Enable MPEG-4 parser and decoder #6024

Merged
merged 3 commits into from
Oct 13, 2023
Merged

FFmpeg: Enable MPEG-4 parser and decoder #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a4ed7d
FFmpeg: Enable MPEG-4 parser and decoder
FreezyLemon Oct 12, 2023
b708418
Clean up ffmpeg build dependencies
FreezyLemon Oct 12, 2023
05d4bf7
Add flv decoder (Sorenson Spark)
FreezyLemon Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-ffmpeg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions osu.Framework.NativeLibs/scripts/ffmpeg/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down