updated ffmeg due to access violations on some windows systems

vitrivr · Oct 26, 2023 · 823da7a · 823da7a
1 parent 6d29951
commit 823da7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,5 @@ resources/
 
 #IIIF
 iiif-media-*/
+
+cineast-api/src/main/python/__pycache__/
diff --git a/...re/src/main/java/org/vitrivr/cineast/core/extraction/decode/video/FFMpegVideoDecoder.java b/...re/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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,3 +69,5 @@ resources/

		#IIIF
		iiif-media-*/

		cineast-api/src/main/python/__pycache__/