Skip to content

Commit

Permalink
* Restore static calls to FFmpegFrameGrabber.tryLoad() and `FFmpeg…
Browse files Browse the repository at this point in the history
…FrameRecorder.tryLoad()` (issue bytedeco#1756)
  • Loading branch information
saudet committed Feb 19, 2022
1 parent 48f58d7 commit fef1d8e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* 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))

### February 11, 2022 version 1.5.7
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ public static void tryLoad() throws Exception {
}
}

// static {
// try {
// tryLoad();
static {
try {
tryLoad();
// FFmpegLockCallback.init();
// } catch (Exception ex) { }
// }
} catch (Exception ex) { }
}

public FFmpegFrameGrabber(File file) {
this(file.getAbsolutePath());
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/bytedeco/javacv/FFmpegFrameRecorder.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ public static void tryLoad() throws Exception {
}
}

// static {
// try {
// tryLoad();
static {
try {
tryLoad();
// FFmpegLockCallback.init();
// } catch (Exception ex) { }
// }
} catch (Exception ex) { }
}

public FFmpegFrameRecorder(File file, int audioChannels) {
this(file, 0, 0, audioChannels);
Expand Down

0 comments on commit fef1d8e

Please sign in to comment.