diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 3ca34ce30..80a1fd179 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -26,6 +26,9 @@ install_svt() { ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 ) # if patch apply fails, try increasing $FFMPEG_GIT_DEPTH git am -3 SVT-HEVC/ffmpeg_plugin/master-*.patch + patch SVT-VP9/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/\ +.github/scripts/Linux/tmp/\ +master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch" git am -3 SVT-VP9/ffmpeg_plugin/master-*.patch } diff --git a/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch b/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch new file mode 100644 index 000000000..e71e27273 --- /dev/null +++ b/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch @@ -0,0 +1,62 @@ +1c1 +< From bcecbfb0188680c2f4e355ad843639f6198b36da Mon Sep 17 00:00:00 2001 +--- +> From e8e7fe02ad0a7c1f8d125594a52d6163d489855b Mon Sep 17 00:00:00 2001 +20c20 +< index 71386c3920..3d3e7ba5a5 100755 +--- +> index 55676f742a..eb0254d5c6 100755 +23c23 +< @@ -292,6 +292,7 @@ External library support: +--- +> @@ -293,6 +293,7 @@ External library support: +27a28 +> --enable-libvvenc enable H.266/VVC encoding via vvenc [no] +30,31c31 +< --enable-libx265 enable HEVC encoding via x265 [no] +< @@ -1948,6 +1949,7 @@ EXTERNAL_LIBRARY_LIST=" +--- +> @@ -1951,6 +1952,7 @@ EXTERNAL_LIBRARY_LIST=" +39c39 +< @@ -3537,6 +3539,7 @@ libvpx_vp8_decoder_deps="libvpx" +--- +> @@ -3556,6 +3558,7 @@ libvpx_vp8_decoder_deps="libvpx" +43a44 +> libvvenc_encoder_deps="libvvenc" +46,47c47 +< libx262_encoder_deps="libx262" +< @@ -6995,6 +6998,7 @@ enabled libvpx && { +--- +> @@ -6997,6 +7000,7 @@ enabled libvpx && { +51a52 +> enabled libvvenc && require_pkg_config libvvenc "libvvenc >= 1.6.1" "vvenc/vvenc.h" vvenc_get_version +54d54 +< enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } +56c56 +< index 8c8c2ce659..2a00269821 100644 +--- +> index ffab0a8e11..7a23165264 100644 +59c59 +< @@ -1149,6 +1149,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o +--- +> @@ -1150,6 +1150,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o +63a64 +> OBJS-$(CONFIG_LIBVVENC_ENCODER) += libvvenc.o +66d66 +< OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o +68c68 +< index 2386b450a6..58b17d4c34 100644 +--- +> index 59d36dbd56..89456aeec1 100644 +71c71 +< @@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encoder; +--- +> @@ -800,6 +800,7 @@ extern const FFCodec ff_libvpx_vp8_encoder; +75a76 +> extern const FFCodec ff_libvvenc_encoder; +78d78 +< extern const FFCodec ff_libwebp_encoder; +787c787 +< 2.44.0 +--- +> 2.45.2