mirror of
https://github.com/RPCS3/ffmpeg-core.git
synced 2026-01-31 01:25:19 +01:00
CI: add CI for ubuntu-20.04, add more encoder options
This commit is contained in:
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@@ -11,7 +11,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
build: [ubuntu-x64, windows-x64, macos-x64, macos-arm64]
|
||||
build: [ubuntu-x64, ubuntu-20.04-x64, windows-x64, macos-x64, macos-arm64]
|
||||
config: [Release]
|
||||
include:
|
||||
- build: ubuntu-x64
|
||||
@@ -19,6 +19,12 @@ jobs:
|
||||
triplet: x64-linux-release
|
||||
vcpkg-root: /usr/local/share/vcpkg
|
||||
extra-args: ""
|
||||
- build: ubuntu-20.04-x64
|
||||
os: ubuntu-20.04
|
||||
triplet: x64-linux-release
|
||||
upload-path: /home/runner/.cache/vcpkg/archives
|
||||
vcpkg-root: /usr/local/share/vcpkg
|
||||
extra-args: ""
|
||||
- build: windows-x64
|
||||
os: windows-latest
|
||||
triplet: x64-win-llvm-static-release
|
||||
@@ -48,6 +54,11 @@ jobs:
|
||||
sudo apt -y install nasm
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
|
||||
- name: Set up build environment (ubuntu-20.04)
|
||||
run: |
|
||||
sudo apt -y install nasm
|
||||
if: matrix.os == 'ubuntu-20.04'
|
||||
|
||||
- name: Patch vcpkg
|
||||
run: |
|
||||
(cd ${{ matrix.vcpkg-root }} && git fetch origin)
|
||||
|
||||
@@ -2,7 +2,7 @@ diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
|
||||
index 35bac875b..5137c69be 100644
|
||||
--- a/ports/ffmpeg/portfile.cmake
|
||||
+++ b/ports/ffmpeg/portfile.cmake
|
||||
@@ -42,7 +42,20 @@ else()
|
||||
@@ -42,7 +42,19 @@ else()
|
||||
set(LIB_PATH_VAR "LIBRARY_PATH")
|
||||
endif()
|
||||
|
||||
@@ -13,13 +13,12 @@ index 35bac875b..5137c69be 100644
|
||||
+string(APPEND OPTIONS " --disable-everything")
|
||||
+string(APPEND OPTIONS " --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=atrac3 --enable-decoder=atrac3p --enable-decoder=atrac9 --enable-decoder=mp3 --enable-decoder=pcm_s16le --enable-decoder=pcm_s8")
|
||||
+string(APPEND OPTIONS " --enable-decoder=mov --enable-decoder=h264 --enable-decoder=mpeg4 --enable-decoder=mpeg2video --enable-decoder=mjpeg --enable-decoder=mjpegb")
|
||||
+string(APPEND OPTIONS " --enable-encoder=pcm_s16le")
|
||||
+string(APPEND OPTIONS " --enable-encoder=ffv1 --enable-encoder=mpeg4 --enable-encoder=mjpeg")
|
||||
+string(APPEND OPTIONS " --enable-encoder=pcm_s16le --enable-encoder=mp3 --enable-encoder=aac_latm")
|
||||
+string(APPEND OPTIONS " --enable-encoder=ffv1 --enable-encoder=mpeg4 --enable-encoder=mjpeg --enable-encoder=h264")
|
||||
+string(APPEND OPTIONS " --enable-muxer=avi")
|
||||
+string(APPEND OPTIONS " --enable-demuxer=h264 --enable-demuxer=m4v --enable-demuxer=mp3 --enable-demuxer=mpegvideo --enable-demuxer=mpegps --enable-demuxer=mjpeg --enable-demuxer=mov --enable-demuxer=avi --enable-demuxer=aac --enable-demuxer=pmp --enable-demuxer=oma --enable-demuxer=pcm_s16le --enable-demuxer=pcm_s8 --enable-demuxer=wav")
|
||||
+string(APPEND OPTIONS " --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=mjpeg --enable-parser=aac --enable-parser=aac_latm")
|
||||
+string(APPEND OPTIONS " --enable-protocol=file")
|
||||
+string(APPEND OPTIONS " --enable-bsf=mjpeg2jpeg")
|
||||
+string(APPEND OPTIONS " --enable-indev=dshow")
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
|
||||
BIN
lib/linux/ubuntu-20.04/x86_64/libavcodec.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libavcodec.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libavdevice.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libavdevice.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libavfilter.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libavfilter.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libavformat.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libavformat.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libavutil.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libavutil.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libswresample.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libswresample.a
Normal file
Binary file not shown.
BIN
lib/linux/ubuntu-20.04/x86_64/libswscale.a
Normal file
BIN
lib/linux/ubuntu-20.04/x86_64/libswscale.a
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user