ffmpeg scan remap fix, configure.ac all or none fix, 3rd party libs: ffmpeg, turbo...

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

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
index ad17541c0a141cf7b2138cd71670764e374567a8..0cf24e74ac7da2f55374948d67330fce9b98aa7b 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
@@ -1,8 +1,8 @@
 diff --git a/libavutil/hwcontext_cuda.c b/libavutil/hwcontext_cuda.c
-index a87c280cf7..718def3dab 100644
+index 718a449b6e..84685fe1d9 100644
 --- a/libavutil/hwcontext_cuda.c
 +++ b/libavutil/hwcontext_cuda.c
-@@ -296,9 +296,11 @@ static void cuda_device_uninit(AVHWDeviceContext *device_ctx)
+@@ -269,9 +269,11 @@ static void cuda_device_uninit(AVHWDeviceContext *device_ctx)
          CudaFunctions *cu = hwctx->internal->cuda_dl;
  
          if (hwctx->internal->is_allocated && hwctx->cuda_ctx) {
@@ -14,7 +14,7 @@ index a87c280cf7..718def3dab 100644
                  CHECK_CU(cu->cuCtxDestroy(hwctx->cuda_ctx));
  
              hwctx->cuda_ctx = NULL;
-@@ -348,7 +350,7 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
+@@ -321,7 +323,7 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
      cu = hwctx->internal->cuda_dl;
  
      hwctx->internal->flags = flags;
@@ -23,7 +23,7 @@ index a87c280cf7..718def3dab 100644
      if (flags & AV_CUDA_USE_PRIMARY_CONTEXT) {
          ret = CHECK_CU(cu->cuDevicePrimaryCtxGetState(hwctx->internal->cuda_device,
                         &dev_flags, &dev_active));
-@@ -369,7 +371,9 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
+@@ -342,7 +344,9 @@ static int cuda_context_init(AVHWDeviceContext *device_ctx, int flags) {
                                                      hwctx->internal->cuda_device));
          if (ret < 0)
              return ret;