This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 7a065cfd577634f67941a5eedbd7363d53345b73 Author: Philip Langdale <[email protected]> AuthorDate: Sat Apr 26 16:26:54 2025 -0700 Commit: Philip Langdale <[email protected]> CommitDate: Sat Aug 29 16:37:09 2026 -0700 avfilter/nvoffruc: add diff for NvOFFRUC.h Although I cannot distribute the header, I can include the diff that has to be applied to make ffmpeg (or for that matter, anything) compile with it. This diff includes fixes from [Usulyre](https://github.com/Usulyre). Thanks! --- libavfilter/nvoffruc-ffmpeg.diff | 53 ++++++++++++++++++++++++++++++++++++++++ libavfilter/vf_nvoffruc.c | 6 ++--- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/libavfilter/nvoffruc-ffmpeg.diff b/libavfilter/nvoffruc-ffmpeg.diff new file mode 100644 index 0000000000..3f6d5c072e --- /dev/null +++ b/libavfilter/nvoffruc-ffmpeg.diff @@ -0,0 +1,53 @@ +--- NvOFFRUC.h 2025-04-26 16:18:00.389485374 -0700 ++++ NvOFFRUC.h 2025-04-26 16:14:11.907541103 -0700 +@@ -13,7 +13,6 @@ + #include <stdlib.h> + #include <string.h> + #include <stdint.h> +-using namespace std; + + #ifdef __linux__ + #define OS_LINUX 1 +@@ -211,9 +210,8 @@ + * Supported error strings + */ + +- static const char *NvOFFRUCErrorString[] +- { +- "This indicates that API call returned with no errors." ++ static const char *NvOFFRUCErrorString[] = { ++ "This indicates that API call returned with no errors.", + "This indicates that HW Optical flow functionality is not supported", + "This indicates that one or more of the pointers passed to the API call is invalid.", + "This indicates that one or more of the parameter passed to the API call is invalid.", +@@ -228,7 +226,7 @@ + "This indicates that the API sequence is incorrect i.e, the order of calls is incorrect", + "This indicates that an interpolated frame could not be written to disk", + "This indicates that one of the FRUC pipeline stages returned error", +- "This indicates that write synchronization failed" ++ "This indicates that write synchronization failed", + "This indicates that an unknown internal error has occurred" + }; + +@@ -241,9 +239,9 @@ + uint32_t uiWidth; /**< [in]: Specifies input/output video surface width. */ + uint32_t uiHeight; /**< [in]: Specifies input/output video surface height. */ + void* pDevice; /**< [in]: Specifies d3d device created by client. */ +- NvOFFRUCResourceType eResourceType; /**< [in]: Specifies whether resource created by client is DX or CUDA. */ +- NvOFFRUCSurfaceFormat eSurfaceFormat; /**< [in]: Specifies surface format i.e. NV12 or ARGB. */ +- NvOFFRUCCUDAResourceType eCUDAResourceType; /**< [in]: Specifies whether CUDA resource is cuDevicePtr or cuArray. */ ++ enum NvOFFRUCResourceType eResourceType; /**< [in]: Specifies whether resource created by client is DX or CUDA. */ ++ enum NvOFFRUCSurfaceFormat eSurfaceFormat; /**< [in]: Specifies surface format i.e. NV12 or ARGB. */ ++ enum NvOFFRUCCUDAResourceType eCUDAResourceType; /**< [in]: Specifies whether CUDA resource is cuDevicePtr or cuArray. */ + uint32_t uiReserved[32]; + }NvOFFRUC_CREATE_PARAM; + +@@ -256,7 +254,7 @@ + void* pFrame; /**< Frame as D3D Resource ID3D11Texture2D* etc:.*/ + double nTimeStamp; /**< Frame time stamp. */ + size_t nCuSurfacePitch; /**< Pitch for CUDA Pitch Allocations*/ +- bool* bHasFrameRepetitionOccurred; /**< [out]: flag to indicate whether frame repeatition has occured */ ++ void* bHasFrameRepetitionOccurred; /**< [out]: flag to indicate whether frame repeatition has occured */ + uint32_t uiReserved[32]; + }NvOFFRUC_FRAMEDATA; + diff --git a/libavfilter/vf_nvoffruc.c b/libavfilter/vf_nvoffruc.c index f966f0abfb..a10bb61655 100644 --- a/libavfilter/vf_nvoffruc.c +++ b/libavfilter/vf_nvoffruc.c @@ -44,9 +44,9 @@ /* * This cannot be distributed with the filter due to licensing. If you want to * compile this filter, you will need to obtain it from nvidia and then fix it - * to work in a pure C environment: - * * Remove the `using namespace std;` - * * Replace the `bool *` with `void *` + * to work in a pure C environment. Apply nvoffruc-ffmpeg.diff to make these + * fixes. + * */ #include "NvOFFRUC.h" -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
