From: CvH <1355173+CvH@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:25:20 +0000 (+0100)
Subject: update ffmpeg to 6.0.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac062fbfe6d37cc79f649fe31b46e445b6f695e;p=thirdparty%2Ftvheadend.git

update ffmpeg to 6.0.1
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 616f6c128..ee700dc9e 100644
--- 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 28ada3b26..f3971f3cd 100644
--- 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;
 }