Skip to content

Commit 15a9056

Browse files
committed
lavc cuda conv: disable by default + note
The actual implementation has not been merged as for now, so disable the stub by default in configure.ac. Also add a notice suggesting the removal.
1 parent 5e2d739 commit 15a9056

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,10 +1897,10 @@ AC_ARG_ENABLE(libavcodec,
18971897
)
18981898

18991899
AC_ARG_ENABLE(lavc-cuda-conv,
1900-
AS_HELP_STRING([--disable-lavc-cuda-conv], [disable lavc CUDA conversions (default is auto)]
1900+
AS_HELP_STRING([--enable-lavc-cuda-conv], [enable lavc CUDA conversions (default is disable)]
19011901
[Requires: libavcodec CUDA]),
19021902
[lavc_cuda_conv_req=$enableval],
1903-
[lavc_cuda_conv_req=$build_default]
1903+
[lavc_cuda_conv_req=no]
19041904
)
19051905

19061906
if test "$libavcodec_req" != no; then

src/libavcodec/from_lavc_vid_conv_cuda.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
* This file contains CUDA-accelerated conversions from FFmpeg to UltraGrid
55
* pixfmts.
66
* @sa from_lavc_vid_conv.h
7+
* @todo
8+
* Consider removal - the actual conversions has not been merged until now
9+
* (2025-11), the imnplementation in .cu file is just a stub.
710
*/
811
/*
9-
* Copyright (c) 2024 CESNET, z. s. p. o.
12+
* Copyright (c) 2024-2025 CESNET, zájmové sdružení právnických osob
1013
* All rights reserved.
1114
*
1215
* Redistribution and use in source and binary forms, with or without

src/libavcodec/to_lavc_vid_conv_cuda.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
* This file contains CUDA-accelerated conversions from UltraGrid to
55
FFmpeg pixel formats.
66
* @sa to_lavc_vid_conv.h
7+
* @todo
8+
* Consider removal - the actual conversions has not been merged until now
9+
* (2025-11), the imnplementation in .cu file is just a stub.
710
*/
811
/*
9-
* Copyright (c) 2024 CESNET, z. s. p. o.
12+
* Copyright (c) 2024-2025 CESNET, zájmové sdružení právnických osob
1013
* All rights reserved.
1114
*
1215
* Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)