From 0e7cd3397680340550ed2631e508c8eaf962091c Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Tue, 2 Aug 2022 17:46:28 +0900 Subject: [PATCH] * Upgrade dependencies for FFmpeg 5.1 --- CHANGELOG.md | 2 +- platform/pom.xml | 2 +- pom.xml | 34 ++++------------------------------ 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d43ef29..f5c6c6fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * Update `FFmpegStreamingTimeout` sample to use `timeout` instead of `stimeout` for RTSP ([pull #1758](https://github.com/bytedeco/javacv/pull/1758)) * Restore static calls to `FFmpegFrameGrabber.tryLoad()` and `FFmpegFrameRecorder.tryLoad()` ([issue #1756](https://github.com/bytedeco/javacv/issues/1756)) * Enable by default on `RealSense2FrameGrabber.start()` all color, depth, and IR streams as `videoStream` ([pull #1750](https://github.com/bytedeco/javacv/pull/1750)) - * Upgrade dependencies for OpenBLAS 0.3.20, OpenCV 4.6.0, FFmpeg 5.0.1, Leptonica 1.82.0 ([pull #1791](https://github.com/bytedeco/javacv/pull/1791)), Tesseract 5.2.0 + * Upgrade dependencies for OpenBLAS 0.3.20, OpenCV 4.6.0, FFmpeg 5.1, Leptonica 1.82.0 ([pull #1791](https://github.com/bytedeco/javacv/pull/1791)), Tesseract 5.2.0 ### February 11, 2022 version 1.5.7 * Fix accuracy and latency issues with `FFmpegFrameGrabber.setVideoFrameNumber()` ([pull #1734](https://github.com/bytedeco/javacv/pull/1734)) diff --git a/platform/pom.xml b/platform/pom.xml index 1055ded9..9466522a 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -38,7 +38,7 @@ org.bytedeco ffmpeg-platform - 5.0.1-${javacpp.version} + 5.1-${javacpp.version} org.bytedeco diff --git a/pom.xml b/pom.xml index d1aa2aba..75a4d1b4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ org.bytedeco ffmpeg - 5.0.1-${javacpp.version} + 5.1-${javacpp.version} org.bytedeco @@ -348,41 +348,15 @@ - OpenJFX-12 + OpenJFX-17 - 12 + 17 org.openjfx javafx-graphics - 12 - - - - - OpenJFX-13 - - 13 - - - - org.openjfx - javafx-graphics - 13 - - - - - OpenJFX-14 - - 14 - - - - org.openjfx - javafx-graphics - 14 + 17