Compare commits
9 Commits
20220728-c
...
20220804
Author | SHA1 | Date | |
---|---|---|---|
6d8af9bd2a | |||
cf5c490ca7 | |||
740c0f1443 | |||
8e736fc176 | |||
0794129eb3 | |||
a510ee6450 | |||
cadbae2468 | |||
eed4f3bfd2 | |||
1173e86544 |
13
.github/actions/libsvtav1/action.yml
vendored
13
.github/actions/libsvtav1/action.yml
vendored
@ -16,12 +16,13 @@ runs:
|
|||||||
run: |
|
run: |
|
||||||
git config --global core.autocrlf false
|
git config --global core.autocrlf false
|
||||||
git config --global core.eol lf
|
git config --global core.eol lf
|
||||||
- name: Checkout SVT AV1
|
git clone -b ${{ inputs.refId }} https://gitlab.com/AOMediaCodec/SVT-AV1 svtav1
|
||||||
uses: actions/checkout@v3
|
#- name: Checkout SVT AV1
|
||||||
with:
|
# uses: actions/checkout@v3
|
||||||
repository: AOMediaCodec/SVT-AV1
|
# with:
|
||||||
ref: ${{ inputs.refId }}
|
# repository: AOMediaCodec/SVT-AV1
|
||||||
path: svtav1
|
# ref: ${{ inputs.refId }}
|
||||||
|
# path: svtav1
|
||||||
- name: Set up MSYS2
|
- name: Set up MSYS2
|
||||||
uses: msys2/setup-msys2@v2
|
uses: msys2/setup-msys2@v2
|
||||||
with:
|
with:
|
||||||
|
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
|||||||
system: windows-2022
|
system: windows-2022
|
||||||
type: static
|
type: static
|
||||||
config: debug
|
config: debug
|
||||||
ffmpegRef: release/5.0
|
ffmpegRef: release/5.1
|
||||||
|
|
||||||
ffmpeg-static-release:
|
ffmpeg-static-release:
|
||||||
uses: ./.github/workflows/ffmpeg.yml
|
uses: ./.github/workflows/ffmpeg.yml
|
||||||
@ -20,4 +20,4 @@ jobs:
|
|||||||
system: windows-2022
|
system: windows-2022
|
||||||
type: static
|
type: static
|
||||||
config: release
|
config: release
|
||||||
ffmpegRef: release/5.0
|
ffmpegRef: release/5.1
|
||||||
|
8
.github/workflows/ffmpeg.yml
vendored
8
.github/workflows/ffmpeg.yml
vendored
@ -32,7 +32,7 @@ on:
|
|||||||
ffmpegRef:
|
ffmpegRef:
|
||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
default: 'release/5.0'
|
default: 'release/5.1'
|
||||||
description: 'FFmpeg refId'
|
description: 'FFmpeg refId'
|
||||||
|
|
||||||
workflow_call:
|
workflow_call:
|
||||||
@ -84,7 +84,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: ./.github/actions/libsvtav1
|
- uses: ./.github/actions/libsvtav1
|
||||||
with:
|
with:
|
||||||
refId: v1.1.0
|
refId: v1.2.0
|
||||||
config: ${{ inputs.config }}
|
config: ${{ inputs.config }}
|
||||||
|
|
||||||
libsnappy:
|
libsnappy:
|
||||||
@ -221,8 +221,8 @@ jobs:
|
|||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
run: |
|
||||||
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
|
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
|
||||||
md build dist
|
md build dist 0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch
|
||||||
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --pkg-config-flags="--static" --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
|
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
|
||||||
- name: Publish FFmpeg artifacts
|
- name: Publish FFmpeg artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
Reference in New Issue
Block a user