From 6d1b48e110607c8f19a0296e8a570b01a643c18c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Cartegnie?= Date: Mon, 12 Aug 2024 19:32:42 +0700 Subject: [PATCH] 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 --- modules/codec/avcodec/d3d11va.c | 4 ++++ modules/codec/avcodec/dxva2.c | 4 ++++ 2 files changed, 8 insertions(+) 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 **); -- 2.30.2