Skip to content

Commit

Permalink
* Add @MemberGetter for av_log_default_callback() in presets for…
Browse files Browse the repository at this point in the history
… FFmpeg (issue #812)
  • Loading branch information
saudet committed Apr 11, 2021
1 parent 7996aeb commit adf4321
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add `@MemberGetter` for `av_log_default_callback()` in presets for FFmpeg ([issue #812](https://github.com/bytedeco/javacpp-presets/issues/812))
* Include `cudaGL.h` and `cuda_gl_interop.h` header files in presets for CUDA ([pull #1027](https://github.com/bytedeco/javacpp-presets/pull/1027))
* Add presets for NVIDIA Video Codec SDK 11.0.10 ([pull #1020](https://github.com/bytedeco/javacpp-presets/pull/1020)), PyTorch 1.8.1 ([issue #623](https://github.com/bytedeco/javacpp-presets/issues/623)), ModSecurity ([pull #1012](https://github.com/bytedeco/javacpp-presets/pull/1012))
* Map `std::vector<cv::Range>` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607))
Expand Down
6 changes: 6 additions & 0 deletions ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@
package org.bytedeco.ffmpeg.presets;

import org.bytedeco.javacpp.Loader;
import org.bytedeco.javacpp.Pointer;
import org.bytedeco.javacpp.annotation.Cast;
import org.bytedeco.javacpp.annotation.MemberGetter;
import org.bytedeco.javacpp.annotation.Name;
import org.bytedeco.javacpp.annotation.NoException;
import org.bytedeco.javacpp.annotation.Platform;
import org.bytedeco.javacpp.annotation.Properties;
import org.bytedeco.javacpp.presets.javacpp;
Expand Down Expand Up @@ -170,4 +173,7 @@ public void map(InfoMap infoMap) {
public static native @MemberGetter @Name("AVERROR(ERANGE)") int AVERROR_ERANGE();
public static native @MemberGetter @Name("AVERROR(ESPIPE)") int AVERROR_ESPIPE();
public static native @MemberGetter @Name("AVERROR(EXDEV)") int AVERROR_EXDEV();

public static native @MemberGetter @Cast("void (*)(void*, int, const char*, va_list)") Pointer av_log_default_callback();
@NoException public static native void av_log_set_callback(@Cast("void (*)(void*, int, const char*, va_list)") Pointer callback);
}

0 comments on commit adf4321

Please sign in to comment.