Credit ffmpeg team with upgrade to 6.1

[goodguy/cinelerra.git] / cinelerra-5.1 / thirdparty / src / ffmpeg.git.patch10

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
index c94880d020e778fb7db7558eabbef24a87d81c12..1fc3f8904a54eb2206c175bade061e21edc6b2a6 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
@@ -1,34 +1,16 @@
---- a/libavutil/hwcontext_cuda.c
-+++ b/libavutil/hwcontext_cuda.c
-@@ -286,9 +286,11 @@
-         CudaFunctions *cu = hwctx->internal->cuda_dl;
- 
-         if (hwctx->internal->is_allocated && hwctx->cuda_ctx) {
-+#ifdef CUDA_PRIMARY_CTX
-             if (hwctx->internal->flags & AV_CUDA_USE_PRIMARY_CONTEXT)
-                 CHECK_CU(cu->cuDevicePrimaryCtxRelease(hwctx->internal->cuda_device));
-             else
-+#endif
-                 CHECK_CU(cu->cuCtxDestroy(hwctx->cuda_ctx));
- 
-             hwctx->cuda_ctx = NULL;
-@@ -338,7 +340,7 @@
-     cu = hwctx->internal->cuda_dl;
- 
-     hwctx->internal->flags = flags;
--
-+#ifdef CUDA_PRIMARY_CTX
-     if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
-         ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device,
-                        &dev_flags, &dev_active));
-@@ -359,7 +361,9 @@
+--- a/libavutil/hwcontext_cuda.c.orig  2023-11-11 03:25:17.000000000 +0300
++++ b/libavutil/hwcontext_cuda.c       2023-11-12 17:52:01.243063419 +0300
+@@ -361,11 +361,13 @@
                                                      hwctx->internal->cuda_device));
          if (ret < 0)
              return ret;
--    } else {
-+    } else
++#if 0
+     } else if (flags & AV_CUDA_USE_CURRENT_CONTEXT) {
+         ret = CHECK_CU(cu->cuCtxGetCurrent(&hwctx->cuda_ctx));
+         if (ret < 0)
+             return ret;
+         av_log(device_ctx, AV_LOG_INFO, "Using current CUDA context.\n");
 +#endif
-+    {
+     } else {
          ret = CHECK_CU(cu->cuCtxCreate(&hwctx->cuda_ctx, desired_flags,
                                         hwctx->internal->cuda_device));
-         if (ret < 0)