Skip to content

Commit c096db7

Browse files
silenium-devsilenium-dev
committed
chore: update ffmpeg to 7.1
1 parent 5bca629 commit c096db7

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎ffmpeg/cppbuild.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ SPEEX=speex-1.2.1
3333
OPUS=opus-1.3.1
3434
OPENCORE_AMR=opencore-amr-0.1.6
3535
VO_AMRWBENC=vo-amrwbenc-0.1.3
36-
OPENSSL=openssl-3.3.1
36+
OPENSSL=openssl-3.3.2
3737
OPENH264_VERSION=2.4.1
3838
X264=x264-stable
3939
X265=3.4
40-
VPX_VERSION=1.14.0
41-
ALSA_VERSION=1.2.11
42-
FREETYPE_VERSION=2.13.2
43-
VPL_VERSION=2.12.0
40+
VPX_VERSION=1.14.1
41+
ALSA_VERSION=1.2.12
42+
FREETYPE_VERSION=2.13.3
43+
VPL_VERSION=2.14.0
4444
NVCODEC_VERSION=12.2.72.0
4545
XML2=libxml2-2.9.12
4646
LIBSRT_VERSION=1.5.3
4747
WEBP_VERSION=1.4.0
48-
AOMAV1_VERSION=3.8.2
49-
SVTAV1_VERSION=2.0.0
48+
AOMAV1_VERSION=3.9.1
49+
SVTAV1_VERSION=2.2.1
5050
ZIMG_VERSION=3.0.5
51-
FFMPEG_VERSION=7.0
51+
FFMPEG_VERSION=7.1
5252
download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz
5353
download https://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz
5454
download https://downloads.sourceforge.net/project/lame/lame/3.100/$LAME.tar.gz $LAME.tar.gz
@@ -123,7 +123,7 @@ patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-vulkan.patch
123123
sedinplace 's/bool bEnableavx512/bool bEnableavx512 = false/g' x265-*/source/common/param.h
124124
sedinplace 's/detect512()/false/g' x265-*/source/common/quant.cpp
125125
sedinplace 's/CMAKE_C_COMPILER_ID MATCHES "Clang"/FALSE/g' SVT-AV1-*/CMakeLists.txt
126-
sedinplace 's/defined(__linux__)/defined(__linux__) \&\& !defined(__ANDROID__)/g' SVT-AV1-*/Source/Lib/Common/Codec/EbThreads.h
126+
sedinplace 's/defined(__linux__)/defined(__linux__) \&\& !defined(__ANDROID__)/g' SVT-AV1-*/Source/Lib/Codec/svt_threads.h
127127
sedinplace '/ANativeWindow_release/d' ffmpeg-*/libavutil/hwcontext_mediacodec.c
128128
sedinplace 's/#define MAX_SLICES 32/#define MAX_SLICES 256/g' ffmpeg-*/libavcodec/h264dec.h
129129

‎ffmpeg/ffmpeg.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
2-
--- ffmpeg-7.0/configure 2024-04-05 08:22:59.000000000 +0900
3-
+++ ffmpeg-7.0-patch/configure 2024-04-20 00:59:06.473315424 +0900
4-
@@ -6823,7 +6823,7 @@
1+
diff -ruN ffmpeg-7.1/configure ffmpeg-7.1-patch/configure
2+
--- ffmpeg-7.1/configure 2024-09-30 08:31:47.000000000 +0900
3+
+++ ffmpeg-7.1-patch/configure 2024-10-13 20:41:25.648732122 +0900
4+
@@ -6865,7 +6865,7 @@
55
enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
66
enabled ladspa && require_headers "ladspa.h dlfcn.h"
77
enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext
8-
-enabled libaom && require_pkg_config libaom "aom >= 1.0.0" aom/aom_codec.h aom_codec_version
8+
-enabled libaom && require_pkg_config libaom "aom >= 2.0.0" aom/aom_codec.h aom_codec_version
99
+enabled libaom && require libaom aom/aom_codec.h aom_codec_version -laom
1010
enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new ||
1111
{ enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
1212
die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; }
13-
@@ -6851,7 +6851,7 @@
13+
@@ -6893,7 +6893,7 @@
1414
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
1515
enabled fontconfig && enable libfontconfig
1616
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
@@ -19,7 +19,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
1919
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
2020
enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
2121
enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
22-
@@ -6881,15 +6881,7 @@
22+
@@ -6925,15 +6925,7 @@
2323
# pkg-config support. Instead, users should make sure that the build
2424
# can find the libraries and headers through other means.
2525
elif enabled libmfx; then
@@ -36,7 +36,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
3636
warn "libmfx is deprecated. Please run configure with --enable-libvpl to use libvpl instead."
3737
elif enabled libvpl; then
3838
# Consider pkg-config only. The name of libmfx is still passed to check_pkg_config function for --enable-libvpl option
39-
@@ -6917,21 +6909,14 @@
39+
@@ -6962,21 +6954,14 @@
4040
{ check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
4141
require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
4242
require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
@@ -60,7 +60,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
6060
enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create
6161
enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
6262
enabled libqrencode && require_pkg_config libqrencode libqrencode qrencode.h QRcode_encodeString
63-
@@ -6949,9 +6934,9 @@
63+
@@ -6994,9 +6979,9 @@
6464
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
6565
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
6666
enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
@@ -73,7 +73,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
7373
enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
7474
enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
7575
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
76-
@@ -6971,19 +6956,15 @@
76+
@@ -7016,19 +7001,15 @@
7777

7878
enabled libvpx && {
7979
enabled libvpx_vp8_decoder && {
@@ -93,17 +93,17 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
9393
check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
9494
}
9595
if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
96-
@@ -6992,27 +6973,27 @@
97-
}
96+
@@ -7038,27 +7019,27 @@
9897

98+
enabled libvvenc && require_pkg_config libvvenc "libvvenc >= 1.6.1" "vvenc/vvenc.h" vvenc_get_version
9999
enabled libwebp && {
100100
- enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
101101
- enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
102102
-enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
103103
+ enabled libwebp_encoder && require libwebp webp/encode.h WebPGetEncoderVersion -lwebp -lsharpyuv
104104
+ enabled libwebp_anim_encoder && require libwebp_anim_encoder webp/mux.h WebPAnimEncoderOptionsInit -lwebpmux -lwebp -lsharpyuv; }
105105
+enabled libx264 && require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 $pthreads_extralibs &&
106-
require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && {
106+
require_cpp_condition libx264 x264.h "X264_BUILD >= 155" && {
107107
[ "$toolchain" != "msvc" ] ||
108108
require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&
109109
check_cpp_condition libx264_hdr10 x264.h "X264_BUILD >= 163" &&
@@ -114,7 +114,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
114114
enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
115115
enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
116116
enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode
117-
enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "xeve.h" xeve_encode
117+
enabled libxeve && require_pkg_config libxeve "xeve >= 0.5.1" "xeve.h" xeve_encode
118118
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
119119
-enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version
120120
+enabled libzimg && require libzimg zimg.h zimg_get_api_version -lzimg
@@ -127,7 +127,7 @@ diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure
127127
enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init ||
128128
check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init ||
129129
check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto ||
130-
@@ -7051,15 +7032,13 @@
130+
@@ -7097,15 +7078,13 @@
131131
die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
132132
enable omx
133133
enabled omx && require_headers OMX_Core.h

0 commit comments

Comments
 (0)