Skip to content

Commit e71390f

Browse files
saudetsaudet
committed
* Upgrade presets for FFmpeg 8.1.1
1 parent 7a3d912 commit e71390f

17 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎.github/actions/deploy-windows/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ runs:
5454
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
5555
5656
echo Removing broken stuff from WSL, MSYS2, etc
57-
rm "C:/msys64/usr/bin/curl.exe" "C:/msys64/mingw32/bin/curl.exe" "C:/msys64/mingw64/bin/curl.exe"
57+
rm "C:/msys64/usr/bin/curl.exe" "C:/msys64/mingw32/bin/curl.exe" "C:/msys64/mingw64/bin/curl.exe" "C:/msys64/usr/bin/pkg-config.EXE"
5858
rm "C:/WINDOWS/system32/bash.EXE" "C:/msys64/usr/bin/link.exe" "C:/msys64/usr/bin/timeout.exe" "C:/msys64/usr/bin/python.exe" "C:/msys64/usr/bin/python3.exe"
5959
rm "C:/ProgramData/chocolatey/bin/gfortran.exe" "C:/msys64/mingw32/bin/gfortran.exe" "C:/msys64/mingw32/bin/python.exe" "C:/msys64/mingw32/bin/python3.exe"
6060
rm "C:/Strawberry/c/bin/gfortran.exe" "C:/msys64/mingw64/bin/gfortran.exe" "C:/msys64/mingw64/bin/python.exe" "C:/msys64/mingw64/bin/python3.exe"
@@ -166,7 +166,7 @@ runs:
166166
rem bash -c "sed -i '/device_merge_sort.cuh/d' 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/cub/cub.cuh'"
167167
rem bash -c "sed -i '/device_segmented_sort.cuh/d' 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/cub/cub.cuh'"
168168
rem bash -c "sed -i '/warp_merge_sort.cuh/d' 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/cub/cub.cuh'"
169-
bash -c "cp -a ""C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/cccl/*"" ""C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/"""
169+
rem bash -c "cp -a ""C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/cccl/*"" ""C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/include/"""
170170
bash -c "find 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.2/'"
171171
)
172172

‎.github/workflows/ffmpeg.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
steps:
4848
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
4949
# linux-armhf:
50-
# runs-on: ubuntu-22.04
50+
# runs-on: ubuntu-22.04-arm
5151
# strategy:
5252
# matrix:
5353
# ext: ["", -gpl]
5454
# steps:
5555
# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
5656
linux-arm64:
57-
runs-on: ubuntu-22.04
57+
runs-on: ubuntu-22.04-arm
5858
strategy:
5959
matrix:
6060
ext: ["", -gpl]
@@ -82,7 +82,7 @@ jobs:
8282
steps:
8383
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
8484
macosx-arm64:
85-
runs-on: macos-15-intel
85+
runs-on: macos-15
8686
strategy:
8787
matrix:
8888
ext: ["", -gpl]

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Add new `SampleOnnxMNIST` in samples for TensorRT ([pull #1742](https://github.com/bytedeco/javacpp-presets/pull/1742))
88
* Fix loading issues with `libomp.dylib` and `libiomp5.dylib` for DNNL and PyTorch on Mac
99
* Include `model_package_loader.h` header file in presets for PyTorch ([issue #1729](https://github.com/bytedeco/javacpp-presets/issues/1729))
10-
* Upgrade presets for FFmpeg 8.1, OpenBLAS 0.3.32, CUDA 13.2.1, cuDNN 9.21.1.3, NCCL 2.30.4, nvCOMP 5.2.0.10, CPython 3.14.4, NumPy 2.4.4, SciPy 1.17.1, LLVM 22.1.1, PyTorch 2.12.0, TensorFlow Lite 2.21.0, TensorRT 10.16.1.11, Triton Inference Server 2.68.0, ONNX 1.21.0, ONNX Runtime 1.26.0 ([pull #1753](https://github.com/bytedeco/javacpp-presets/pull/1753)), and their dependencies
10+
* Upgrade presets for FFmpeg 8.1.1, OpenBLAS 0.3.32, CUDA 13.2.1, cuDNN 9.21.1.3, NCCL 2.30.4, nvCOMP 5.2.0.10, CPython 3.14.4, NumPy 2.4.4, SciPy 1.17.1, LLVM 22.1.1, PyTorch 2.12.0, TensorFlow Lite 2.21.0, TensorRT 10.16.1.11, Triton Inference Server 2.68.0, ONNX 1.21.0, ONNX Runtime 1.26.0 ([pull #1753](https://github.com/bytedeco/javacpp-presets/pull/1753)), and their dependencies
1111
* Compile classes with `parameters` bumping minimum requirements to Java SE 8 and Android 7.0 ([issue #1739](https://github.com/bytedeco/javacpp-presets/issues/1739))
1212

1313
### February 22, 2026 version 1.5.13

‎ffmpeg/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Introduction
99
------------
1010
This directory contains the JavaCPP Presets module for:
1111

12-
* FFmpeg 8.1 http://ffmpeg.org/
12+
* FFmpeg 8.1.1 http://ffmpeg.org/
1313

1414
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
1515

@@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>ffmpeg-platform</artifactId>
49-
<version>8.1-1.5.14-SNAPSHOT</version>
49+
<version>8.1.1-1.5.14-SNAPSHOT</version>
5050
</dependency>
5151

5252
<!-- Optional GPL builds with (almost) everything enabled -->
5353
<dependency>
5454
<groupId>org.bytedeco</groupId>
5555
<artifactId>ffmpeg-platform-gpl</artifactId>
56-
<version>8.1-1.5.14-SNAPSHOT</version>
56+
<version>8.1.1-1.5.14-SNAPSHOT</version>
5757
</dependency>
5858
</dependencies>
5959
<build>

‎ffmpeg/cppbuild.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,24 @@ SPEEX=speex-1.2.1
3434
OPUS=opus-1.3.1
3535
OPENCORE_AMR=opencore-amr-0.1.6
3636
VO_AMRWBENC=vo-amrwbenc-0.1.3
37-
OPENSSL=openssl-3.5.5
37+
OPENSSL=openssl-3.5.6
3838
OPENH264_VERSION=2.6.0
3939
X264=x264-stable
4040
X265=3.4
4141
VPX_VERSION=1.16.0
4242
ALSA_VERSION=1.2.15.3
4343
FREETYPE_VERSION=2.14.3
44-
HARFBUZZ_VERSION=14.1.0
44+
HARFBUZZ_VERSION=14.2.0
4545
MFX_VERSION=1.35.1
4646
NVCODEC_VERSION=13.0.19.0
4747
XML2=libxml2-2.9.12
48-
LIBSRT_VERSION=1.5.4
48+
LIBSRT_VERSION=1.5.5
4949
WEBP_VERSION=1.6.0
50-
AOMAV1_VERSION=3.13.3
50+
AOMAV1_VERSION=3.14.1
5151
SVTAV1_VERSION=4.1.0
5252
ZIMG_VERSION=3.0.6
53-
FFMPEG_VERSION=8.1
53+
FFMPEG_VERSION=8.1.1
54+
5455
# Vendored snapshot of https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20847.patch
5556
# with the unsupported FFmpeg 8.1 Changelog hunk already removed.
5657
V4L2_REQUEST_PATCH=ffmpeg-v4l2-request-20847-ffmpeg-8.1.patch
@@ -70,9 +71,9 @@ download https://ftp.osuosl.org/pub/blfs/conglomeration/alsa-lib/alsa-lib-$ALSA_
7071
download https://ftp.osuosl.org/pub/blfs/conglomeration/freetype/freetype-$FREETYPE_VERSION.tar.xz freetype-$FREETYPE_VERSION.tar.xz
7172
download https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ_VERSION.tar.gz harfbuzz-$HARFBUZZ_VERSION.tar.gz
7273
download https://github.com/lu-zero/mfx_dispatch/archive/$MFX_VERSION.tar.gz mfx_dispatch-$MFX_VERSION.tar.gz
74+
download https://github.com/FFmpeg/nv-codec-headers/archive/n$NVCODEC_VERSION.tar.gz nv-codec-headers-$NVCODEC_VERSION.tar.gz
7375
download http://xmlsoft.org/sources/$XML2.tar.gz $XML2.tar.gz
7476
download https://github.com/Haivision/srt/archive/refs/tags/v$LIBSRT_VERSION.tar.gz srt-$LIBSRT_VERSION.tar.gz
75-
download https://github.com/FFmpeg/nv-codec-headers/archive/n$NVCODEC_VERSION.tar.gz nv-codec-headers-$NVCODEC_VERSION.tar.gz
7677
download https://github.com/webmproject/libwebp/archive/refs/tags/v$WEBP_VERSION.tar.gz libwebp-$WEBP_VERSION.tar.gz
7778
download https://storage.googleapis.com/aom-releases/libaom-$AOMAV1_VERSION.tar.gz aom-$AOMAV1_VERSION.tar.gz
7879
download https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$SVTAV1_VERSION/SVT-AV1-v$SVTAV1_VERSION.tar.gz SVT-AV1-$SVTAV1_VERSION.tar.gz
@@ -125,7 +126,7 @@ export PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/
125126

126127
patch -Np1 -d $LAME < ../../lame.patch
127128
# patch -Np1 -d $OPENSSL < ../../openssl-android.patch
128-
patch -Np1 -d $OPENSSL < ../../openssl-windows.patch
129+
# patch -Np1 -d $OPENSSL < ../../openssl-windows.patch
129130
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg.patch
130131
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-vulkan.patch
131132
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../$V4L2_REQUEST_PATCH

‎ffmpeg/platform/gpl/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>ffmpeg-platform-gpl</artifactId>
15-
<version>8.1-${project.parent.version}</version>
15+
<version>8.1.1-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for FFmpeg (GPL enabled)</name>
1717

1818
<properties>

‎ffmpeg/platform/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>ffmpeg-platform</artifactId>
15-
<version>8.1-${project.parent.version}</version>
15+
<version>8.1.1-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for FFmpeg</name>
1717

1818
<properties>

‎ffmpeg/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>ffmpeg</artifactId>
14-
<version>8.1-${project.parent.version}</version>
14+
<version>8.1.1-${project.parent.version}</version>
1515
<name>JavaCPP Presets for FFmpeg</name>
1616

1717
<dependencies>

‎ffmpeg/samples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>ffmpeg-platform</artifactId>
15-
<version>8.1-1.5.14-SNAPSHOT</version>
15+
<version>8.1.1-1.5.14-SNAPSHOT</version>
1616
</dependency>
1717

1818
<!-- Optional GPL builds with (almost) everything enabled -->
1919
<dependency>
2020
<groupId>org.bytedeco</groupId>
2121
<artifactId>ffmpeg-platform-gpl</artifactId>
22-
<version>8.1-1.5.14-SNAPSHOT</version>
22+
<version>8.1.1-1.5.14-SNAPSHOT</version>
2323
</dependency>
2424
</dependencies>
2525
<build>

‎ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3959,7 +3959,7 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec {
39593959
// #include "version_major.h"
39603960

39613961
public static final int LIBAVCODEC_VERSION_MINOR = 28;
3962-
public static final int LIBAVCODEC_VERSION_MICRO = 100;
3962+
public static final int LIBAVCODEC_VERSION_MICRO = 101;
39633963

39643964
public static native @MemberGetter int LIBAVCODEC_VERSION_INT();
39653965
public static final int LIBAVCODEC_VERSION_INT = LIBAVCODEC_VERSION_INT();

0 commit comments

Comments
 (0)