From: François Cartegnie <fcvlcdev@free.fr>
Date: Mon, 12 Aug 2024 12:32:42 +0000 (+0700)
Subject: codec: avcodec: bypass removed define for Intel workarounds
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~50
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f9650cd5d86c8d435ec510ab0c31a15ca33c15b6;p=vlc.git

codec: avcodec: bypass removed define for Intel workarounds

adapted from cherry picked commit 1280728ad305f00ceba3491ce11bf66107017a6c

Gbp-Pq: Name 0075-codec-avcodec-bypass-removed-define-for-Intel-workar.patch
---

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index e1560a93..52606283 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -55,6 +55,10 @@
 #define D3D_DecoderSurface  ID3D11VideoDecoderOutputView
 #include "directx_va.h"
 
+#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO
+# define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 // moved to libavcodec/dxva2_internal.h :/
+#endif
+
 static int Open(vlc_va_t *, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat,
                 const es_format_t *, picture_sys_t *p_sys);
 static void Close(vlc_va_t *, void **);
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 2e6809a0..037ad7d4 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -43,6 +43,10 @@
 #define D3D_DecoderSurface  IDirect3DSurface9
 #include "directx_va.h"
 
+#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO
+# define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 // moved to libavcodec/dxva2_internal.h :/
+#endif
+
 static int Open(vlc_va_t *, AVCodecContext *, const AVPixFmtDescriptor *, enum PixelFormat,
                 const es_format_t *, picture_sys_t *p_sys);
 static void Close(vlc_va_t *, void **);