* Work around swscale bug in FFmpegFrameGrabber for images with …

…unaligned width (issue #1960) * Upgrade dependencies for OpenBLAS 0.3.25
bytedeco · Dec 25, 2023 · b34b700 · b34b700
1 parent b65e7f7
commit b34b700
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 
+ * Work around `swscale` bug in `FFmpegFrameGrabber` for images with unaligned width ([issue #1960](https://github.com/bytedeco/javacv/issues/1960))
  * Improve `FFmpegFrameGrabber.setTimestamp()` further for MPEG-TS streams ([pull #2144](https://github.com/bytedeco/javacv/pull/2144))
  * Fix `module-info.java` broken since last release ([issue bytedeco/javacpp-presets#1414](https://github.com/bytedeco/javacpp-presets/issues/1414))
  * Add new `AudioSplitMergeHelper` sample for processing raw audio frames ([pull #2052](https://github.com/bytedeco/javacv/pull/2052))
- * Upgrade dependencies for OpenBLAS 0.3.24, OpenCV 4.8.1, FFmpeg 6.1, Leptonica 1.83.1, Tesseract 5.3.3
+ * Upgrade dependencies for OpenBLAS 0.3.25, OpenCV 4.8.1, FFmpeg 6.1, Leptonica 1.83.1, Tesseract 5.3.3
 
 ### June 6, 2023 version 1.5.9
  * Add `FrameRecorder.videoSideData/audioSideData` properties and `FFmpegFrameRecorder.setDisplayRotation()` for convenience ([issue #1976](https://github.com/bytedeco/javacv/issues/1976))

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.24-${javacpp.version}</version>
+      <version>0.3.25-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.24-${javacpp.version}</version>
+      <version>0.3.25-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java b/src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java
@@ -1148,7 +1148,7 @@ private void initPictureRGB() {
                 int fmt = getPixelFormat();
 
                 // work around bug in swscale: https://trac.ffmpeg.org/ticket/1031
-                int align = 32;
+                int align = 64;
                 int stride = width;
                 for (int i = 1; i <= align; i += i) {
                      stride = (width + (i - 1)) & ~(i - 1);