On 02/10/2024 14:05, James Almer wrote:
On 10/2/2024 7:11 AM, Tobias Rapp wrote:
Adds missing ifdef guards to function prototypes depending on
definitions from
dxva.h which are not available in Mingw-w64 version 4.0. The
configure script
already checks for HEVC/VP9 types in dxva.h.
Signed-off-by: Tobias Rapp <t.r...@noa-archive.com>
---
libavcodec/dxva2_internal.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index 224a867..6cbd0e4 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -171,11 +171,15 @@ void
ff_dxva2_h264_fill_picture_parameters(const AVCodecContext *avctx,
AVDXVACo
void ff_dxva2_h264_fill_scaling_lists(const AVCodecContext
*avctx, AVDXVAContext *ctx, DXVA_Qmatrix_H264 *qm);
+#if CONFIG_HEVC_D3D12VA_HWACCEL || CONFIG_HEVC_D3D11VA_HWACCEL ||
CONFIG_HEVC_D3D11VA2_HWACCEL || CONFIG_HEVC_DXVA2_HWACCEL
void ff_dxva2_hevc_fill_picture_parameters(const AVCodecContext
*avctx, AVDXVAContext *ctx, DXVA_PicParams_HEVC *pp);
void ff_dxva2_hevc_fill_scaling_lists(const AVCodecContext
*avctx, AVDXVAContext *ctx, DXVA_Qmatrix_HEVC *qm);
+#endif
+#if CONFIG_VP9_D3D12VA_HWACCEL || CONFIG_VP9_D3D11VA_HWACCEL ||
CONFIG_VP9_D3D11VA2_HWACCEL || CONFIG_VP9_DXVA2_HWACCEL
int ff_dxva2_vp9_fill_picture_parameters(const AVCodecContext
*avctx, AVDXVAContext *ctx, DXVA_PicParams_VP9 *pp);
+#endif
#if CONFIG_AV1_D3D12VA_HWACCEL || CONFIG_AV1_D3D11VA_HWACCEL ||
CONFIG_AV1_D3D11VA2_HWACCEL || CONFIG_AV1_DXVA2_HWACCEL
int ff_dxva2_av1_fill_picture_parameters(const AVCodecContext
*avctx, AVDXVAContext *ctx, DXVA_PicParams_AV1 *pp);
LGTM. (But i wouldn't recommend using such an old Mingw-w64 build).
Pushed.
Yeah I should maybe upgrade my machine for cross-compiling, but as the
fix was rather trivial and there was precedence with the AV1 ifdefs I
decided to post a patch.
Thanks for review,
Tobias
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
