This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 1ad50bb62ced9c3a8479ebc57dc3c78d89c25eda Author: Diego de Souza <[email protected]> AuthorDate: Wed Jul 15 01:20:28 2026 +0200 Commit: Timo Rothenpieler <[email protected]> CommitDate: Wed Jul 15 02:17:20 2026 +0200 configure: gate CUARRAY support on ffnvcodec capabilities The CUARRAY implementation unconditionally references CUDA array formats and dynamic-loader entries added in nv-codec-headers 13.1. This breaks builds with older ffnvcodec versions that configure still accepts. Probe for the complete CUARRAY header support and use the result to disable only CUARRAY hwaccels and code paths. Ordinary CUDA, NVDEC, NVENC, and hwupload_cuda remain available with older headers. Signed-off-by: Diego de Souza <[email protected]> --- configure | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/configure b/configure index c715098795..e09bbd7f04 100755 --- a/configure +++ b/configure @@ -2714,6 +2714,7 @@ HAVE_LIST=" $THREADS_LIST $TOOLCHAIN_FEATURES $TYPES_LIST + ffnvcodec_cuarray gzip ioctl_posix libdrm_getfb2 @@ -3417,7 +3418,7 @@ av1_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_AV1" av1_dxva2_hwaccel_select="av1_decoder" av1_nvdec_hwaccel_deps="nvdec CUVIDAV1PICPARAMS" av1_nvdec_hwaccel_select="av1_decoder" -av1_nvdec_cuarray_hwaccel_deps="nvdec CUVIDAV1PICPARAMS" +av1_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray CUVIDAV1PICPARAMS" av1_nvdec_cuarray_hwaccel_select="av1_decoder" av1_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferAV1_bit_depth_idx" av1_vaapi_hwaccel_select="av1_decoder" @@ -3445,7 +3446,7 @@ h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_select="h264_decoder" h264_nvdec_hwaccel_deps="nvdec" h264_nvdec_hwaccel_select="h264_decoder" -h264_nvdec_cuarray_hwaccel_deps="nvdec" +h264_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" h264_nvdec_cuarray_hwaccel_select="h264_decoder" h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_select="h264_decoder" @@ -3465,7 +3466,7 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_nvdec_hwaccel_deps="nvdec" hevc_nvdec_hwaccel_select="hevc_decoder" -hevc_nvdec_cuarray_hwaccel_deps="nvdec" +hevc_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" hevc_nvdec_cuarray_hwaccel_select="hevc_decoder" hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" hevc_vaapi_hwaccel_select="hevc_decoder" @@ -3481,7 +3482,7 @@ mjpeg_vaapi_hwaccel_deps="vaapi" mjpeg_vaapi_hwaccel_select="mjpeg_decoder" mpeg1_nvdec_hwaccel_deps="nvdec" mpeg1_nvdec_hwaccel_select="mpeg1video_decoder" -mpeg1_nvdec_cuarray_hwaccel_deps="nvdec" +mpeg1_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" mpeg1_nvdec_cuarray_hwaccel_select="mpeg1video_decoder" mpeg1_vdpau_hwaccel_deps="vdpau" mpeg1_vdpau_hwaccel_select="mpeg1video_decoder" @@ -3497,7 +3498,7 @@ mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_nvdec_hwaccel_deps="nvdec" mpeg2_nvdec_hwaccel_select="mpeg2video_decoder" -mpeg2_nvdec_cuarray_hwaccel_deps="nvdec" +mpeg2_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" mpeg2_nvdec_cuarray_hwaccel_select="mpeg2video_decoder" mpeg2_vaapi_hwaccel_deps="vaapi" mpeg2_vaapi_hwaccel_select="mpeg2video_decoder" @@ -3507,7 +3508,7 @@ mpeg2_videotoolbox_hwaccel_deps="videotoolbox" mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder" mpeg4_nvdec_hwaccel_deps="nvdec" mpeg4_nvdec_hwaccel_select="mpeg4_decoder" -mpeg4_nvdec_cuarray_hwaccel_deps="nvdec" +mpeg4_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" mpeg4_nvdec_cuarray_hwaccel_select="mpeg4_decoder" mpeg4_vaapi_hwaccel_deps="vaapi" mpeg4_vaapi_hwaccel_select="mpeg4_decoder" @@ -3533,7 +3534,7 @@ vc1_dxva2_hwaccel_deps="dxva2" vc1_dxva2_hwaccel_select="vc1_decoder" vc1_nvdec_hwaccel_deps="nvdec" vc1_nvdec_hwaccel_select="vc1_decoder" -vc1_nvdec_cuarray_hwaccel_deps="nvdec" +vc1_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" vc1_nvdec_cuarray_hwaccel_select="vc1_decoder" vc1_vaapi_hwaccel_deps="vaapi" vc1_vaapi_hwaccel_select="vc1_decoder" @@ -3541,7 +3542,7 @@ vc1_vdpau_hwaccel_deps="vdpau" vc1_vdpau_hwaccel_select="vc1_decoder" vp8_nvdec_hwaccel_deps="nvdec" vp8_nvdec_hwaccel_select="vp8_decoder" -vp8_nvdec_cuarray_hwaccel_deps="nvdec" +vp8_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" vp8_nvdec_cuarray_hwaccel_select="vp8_decoder" vp8_vaapi_hwaccel_deps="vaapi" vp8_vaapi_hwaccel_select="vp8_decoder" @@ -3555,7 +3556,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" vp9_dxva2_hwaccel_select="vp9_decoder" vp9_nvdec_hwaccel_deps="nvdec" vp9_nvdec_hwaccel_select="vp9_decoder" -vp9_nvdec_cuarray_hwaccel_deps="nvdec" +vp9_nvdec_cuarray_hwaccel_deps="nvdec ffnvcodec_cuarray" vp9_nvdec_cuarray_hwaccel_select="vp9_decoder" vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth" vp9_vaapi_hwaccel_select="vp9_decoder" @@ -7237,6 +7238,10 @@ if ! disabled ffnvcodec; then check_pkg_config ffnvcodec "ffnvcodec >= 11.1.5.3 ffnvcodec < 12.0" "$ffnv_hdr_list" "" fi +if enabled ffnvcodec; then + check_cpp_condition ffnvcodec_cuarray ffnvcodec/dynlink_loader.h "defined(CUDA_ARRAY3D_VIDEO_ENCODE_DECODE)" +fi + check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" if ! disabled w32threads && ! enabled pthreads; then _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
