update ffmpeg to 6.0.1

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 616f6c128b079fdef66491111ebf9f9b912960b6..ee700dc9eae66981190c307940a46b901ec2ce27 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -108,10 +108,10 @@ FFNVCODEC_TB   = $(FFNVCODEC).tar.gz
 FFNVCODEC_URL  = https://github.com/FFmpeg/nv-codec-headers/releases/download/n$(FFNVCODEC_VER)/nv-codec-headers-$(FFNVCODEC_VER).tar.gz
 FFNVCODEC_SHA1 = 89bee0d3025b813c513084ad8546b0261623fbb0
 
-FFMPEG         = ffmpeg-5.1.4
+FFMPEG         = ffmpeg-6.0.1
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = https://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = e64a16f32289a8bb5629f3b3234b95f11f32a66f
+FFMPEG_SHA1    = e53607510683fcceeb6239b751fa212ca80d6340
 
 
 # ##############################################################################

diff --git a/src/transcoding/transcode/hwaccels/vaapi.c b/src/transcoding/transcode/hwaccels/vaapi.c
index 28ada3b26bb10e27560b9daa09f529060a363e22..f3971f3cde08ab60d7efdfa59e2da158f400a3f9 100644 (file)
--- a/src/transcoding/transcode/hwaccels/vaapi.c
+++ b/src/transcoding/transcode/hwaccels/vaapi.c
@@ -594,7 +594,9 @@ vaapi_decode_setup_context(AVCodecContext *avctx)
     }
 
     avctx->get_buffer2 = vaapi_get_buffer2;
+#if LIBAVCODEC_VERSION_MAJOR < 60
     avctx->thread_safe_callbacks = 0;
+#endif
 
     return 0;
 }