From a0c9e76942ed1c5d0223d840f43161ba8141a0a5 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Mon, 10 Oct 2016 12:54:42 +0200 Subject: [PATCH] avfilter/vf_scale_npp: use dynamically loaded CUDA --- libavfilter/vf_scale_npp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index 8eafdc81fd..78f541e9fe 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -29,7 +29,7 @@ #include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/hwcontext.h" -#include "libavutil/hwcontext_cuda.h" +#include "libavutil/hwcontext_cuda_internal.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" @@ -591,7 +591,7 @@ static int nppscale_filter_frame(AVFilterLink *link, AVFrame *in) (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h, INT_MAX); - err = cuCtxPushCurrent(device_hwctx->cuda_ctx); + err = device_hwctx->internal->cuda_dl->cuCtxPushCurrent(device_hwctx->cuda_ctx); if (err != CUDA_SUCCESS) { ret = AVERROR_UNKNOWN; goto fail; @@ -599,7 +599,7 @@ static int nppscale_filter_frame(AVFilterLink *link, AVFrame *in) ret = nppscale_scale(ctx, out, in); - cuCtxPopCurrent(&dummy); + device_hwctx->internal->cuda_dl->cuCtxPopCurrent(&dummy); if (ret < 0) goto fail;