From 823da7a0b40c1d1689a0a98b8a6507b7d49b0bc0 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 26 Oct 2023 21:13:25 +0200 Subject: [PATCH] updated ffmeg due to access violations on some windows systems --- .gitignore | 2 ++ .../core/extraction/decode/video/FFMpegVideoDecoder.java | 1 + gradle.properties | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47dfa3073..6aa5b837c 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ resources/ #IIIF iiif-media-*/ + +cineast-api/src/main/python/__pycache__/ diff --git a/cineast-core/src/main/java/org/vitrivr/cineast/core/extraction/decode/video/FFMpegVideoDecoder.java b/cineast-core/src/main/java/org/vitrivr/cineast/core/extraction/decode/video/FFMpegVideoDecoder.java index 32c9bdd03..1325f5752 100644 --- a/cineast-core/src/main/java/org/vitrivr/cineast/core/extraction/decode/video/FFMpegVideoDecoder.java +++ b/cineast-core/src/main/java/org/vitrivr/cineast/core/extraction/decode/video/FFMpegVideoDecoder.java @@ -395,6 +395,7 @@ public boolean init(Path path, DecoderConfig decoderConfig, CacheConfig cacheCon this.factory = cacheConfig.sharedCachedDataFactory(); /* Initialize the AVFormatContext. */ + this.pFormatCtx = null; this.pFormatCtx = avformat.avformat_alloc_context(); /* Open video file. */ diff --git a/gradle.properties b/gradle.properties index bb38cb62b..d1c729356 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ version_commonslang3=3.12.0 version_commonsmath3=3.6.1 version_commonstext=1.9 version_cottontaildb_proto=0.14.2 -version_ffmpeg=5.1.2-1.5.8 +version_ffmpeg=6.0-1.5.9 version_gson=2.9.0 version_guava=31.1-jre vershion_hppc=0.9.1