har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_scale_npp: use dynamically loaded CUDA

Browse Source
This commit is contained in:
Timo Rothenpieler 2016-10-10 12:54:42 +02:00
parent d9ad18f3b4
commit a0c9e76942
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_scale_npp.c
View File

@ -29,7 +29,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/hwcontext.h" #include "libavutil/hwcontext.h"
#include "libavutil/hwcontext_cuda.h" #include "libavutil/hwcontext_cuda_internal.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.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, (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h,
INT_MAX); INT_MAX);
err = cuCtxPushCurrent(device_hwctx->cuda_ctx); err = device_hwctx->internal->cuda_dl->cuCtxPushCurrent(device_hwctx->cuda_ctx);
if (err != CUDA_SUCCESS) { if (err != CUDA_SUCCESS) {
ret = AVERROR_UNKNOWN; ret = AVERROR_UNKNOWN;
goto fail; goto fail;
@ -599,7 +599,7 @@ static int nppscale_filter_frame(AVFilterLink *link, AVFrame *in)
ret = nppscale_scale(ctx, out, in); ret = nppscale_scale(ctx, out, in);
cuCtxPopCurrent(&dummy); device_hwctx->internal->cuda_dl->cuCtxPopCurrent(&dummy);
if (ret < 0) if (ret < 0)
goto fail; goto fail;