* Upgrade dependencies for FFmpeg 5.1

Zjaun · Aug 2, 2022 · 0e7cd33 · 0e7cd33
1 parent bc1ea9d
commit 0e7cd33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git 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
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>ffmpeg-platform</artifactId>
-      <version>5.0.1-${javacpp.version}</version>
+      <version>5.1-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>ffmpeg</artifactId>
-      <version>5.0.1-${javacpp.version}</version>
+      <version>5.1-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -348,41 +348,15 @@
       </dependencies>
     </profile>
     <profile>
-      <id>OpenJFX-12</id>
+      <id>OpenJFX-17</id>
       <activation>
-        <jdk>12</jdk>
+        <jdk>17</jdk>
       </activation>
       <dependencies>
         <dependency>
           <groupId>org.openjfx</groupId>
           <artifactId>javafx-graphics</artifactId>
-          <version>12</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>OpenJFX-13</id>
-      <activation>
-        <jdk>13</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.openjfx</groupId>
-          <artifactId>javafx-graphics</artifactId>
-          <version>13</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>OpenJFX-14</id>
-      <activation>
-        <jdk>14</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.openjfx</groupId>
-          <artifactId>javafx-graphics</artifactId>
-          <version>14</version>
+          <version>17</version>
         </dependency>
       </dependencies>
     </profile>