don't use field dropped in ffmpeg >= 6.0 only when building against such version

diff --git a/ffmpeg6.patch b/ffmpeg6.patch
index b7cc7cd6514f75dda0da29306393d6104dce64de..7648a9935519e9334a1d8a488501e4b425d4dcb4 100644 (file)
--- a/ffmpeg6.patch
+++ b/ffmpeg6.patch
@@ -1,11 +1,20 @@
---- tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c~     2023-07-19 21:53:15.000000000 +0200
-+++ tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c      2023-10-21 22:34:37.128586237 +0200
-@@ -594,7 +594,7 @@
+--- tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c.orig 2023-07-19 21:53:15.000000000 +0200
++++ tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c      2023-10-22 00:24:48.608611141 +0200
+@@ -21,6 +21,7 @@
+ #include "../internals.h"
+ #include "vaapi.h"
+ 
++#include <libavcodec/version.h>
+ #include <libavutil/hwcontext.h>
+ #include <libavutil/hwcontext_vaapi.h>
+ #include <libavutil/pixdesc.h>
+@@ -594,7 +595,9 @@
      }
  
      avctx->get_buffer2 = vaapi_get_buffer2;
--    avctx->thread_safe_callbacks = 0;
-+    //avctx->thread_safe_callbacks = 0;
++#if LIBAVCODEC_VERSION_MAJOR < 60
+     avctx->thread_safe_callbacks = 0;
++#endif
  
      return 0;
  }

diff --git a/tvheadend.spec b/tvheadend.spec
index d32ce9eadc3b01460cd8c63c1c7b0d2264eb4040..7b84b5bf5f7c9e62704d8de8c1808978a3d34b85 100644 (file)
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -89,7 +89,7 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/.hts/%{name} \
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-        V=1
+       V=1
 
 %{?with_systemd:cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}