| Message ID | 1683828488-9675-1-git-send-email-dheitmueller@ltnglobal.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] libavfilter/yadif_cuda: Fix build breakage | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, 11 May 2023 at 20:12, Devin Heitmueller < devin.heitmueller@ltnglobal.com> wrote: > Address build breakage caused by my latest series when compiling > with CUDA support. Thanks to Paul Mahol for pointing it out. > > Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> > --- > libavfilter/vf_yadif_cuda.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c > index f3f0b56..73f0412 100644 > --- a/libavfilter/vf_yadif_cuda.c > +++ b/libavfilter/vf_yadif_cuda.c > @@ -205,7 +205,7 @@ static av_cold void deint_cuda_uninit(AVFilterContext > *ctx) > av_frame_free(&y->prev); > av_frame_free(&y->cur); > av_frame_free(&y->next); > - ff_cc_fifo_freep(&y->cc_fifo); > + ff_ccfifo_freep(&y->cc_fifo); > > av_buffer_unref(&s->device_ref); > s->hwctx = NULL; > @@ -295,7 +295,7 @@ static int config_output(AVFilterLink *link) > else > link->frame_rate = ctx->inputs[0]->frame_rate; > > - if (!(s->cc_fifo = ff_cc_fifo_alloc(link->frame_rate, ctx))) { > + if (!(y->cc_fifo = ff_ccfifo_alloc(link->frame_rate, ctx))) { > av_log(ctx, AV_LOG_ERROR, "Failure to setup CC FIFO queue\n"); > ret = AVERROR(ENOMEM); > goto exit; > -- > 1.8.3.1 > I had literally opened a ticket on the same seconds ago: https://trac.ffmpeg.org/ticket/10357 Will close as soon as the patch is merged.
On Fri, May 12, 2023 at 1:12 AM Devin Heitmueller < devin.heitmueller@ltnglobal.com> wrote: > Address build breakage caused by my latest series when compiling > with CUDA support. Thanks to Paul Mahol for pointing it out. > > Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> > --- > libavfilter/vf_yadif_cuda.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c > index f3f0b56..73f0412 100644 > --- a/libavfilter/vf_yadif_cuda.c > +++ b/libavfilter/vf_yadif_cuda.c > @@ -205,7 +205,7 @@ static av_cold void deint_cuda_uninit(AVFilterContext > *ctx) > av_frame_free(&y->prev); > av_frame_free(&y->cur); > av_frame_free(&y->next); > - ff_cc_fifo_freep(&y->cc_fifo); > + ff_ccfifo_freep(&y->cc_fifo); > > av_buffer_unref(&s->device_ref); > s->hwctx = NULL; > @@ -295,7 +295,7 @@ static int config_output(AVFilterLink *link) > else > link->frame_rate = ctx->inputs[0]->frame_rate; > > - if (!(s->cc_fifo = ff_cc_fifo_alloc(link->frame_rate, ctx))) { > + if (!(y->cc_fifo = ff_ccfifo_alloc(link->frame_rate, ctx))) { > av_log(ctx, AV_LOG_ERROR, "Failure to setup CC FIFO queue\n"); > ret = AVERROR(ENOMEM); > goto exit; > -- > 1.8.3.1 > > LGTM, will apply. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index f3f0b56..73f0412 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -205,7 +205,7 @@ static av_cold void deint_cuda_uninit(AVFilterContext *ctx) av_frame_free(&y->prev); av_frame_free(&y->cur); av_frame_free(&y->next); - ff_cc_fifo_freep(&y->cc_fifo); + ff_ccfifo_freep(&y->cc_fifo); av_buffer_unref(&s->device_ref); s->hwctx = NULL; @@ -295,7 +295,7 @@ static int config_output(AVFilterLink *link) else link->frame_rate = ctx->inputs[0]->frame_rate; - if (!(s->cc_fifo = ff_cc_fifo_alloc(link->frame_rate, ctx))) { + if (!(y->cc_fifo = ff_ccfifo_alloc(link->frame_rate, ctx))) { av_log(ctx, AV_LOG_ERROR, "Failure to setup CC FIFO queue\n"); ret = AVERROR(ENOMEM); goto exit;
Address build breakage caused by my latest series when compiling with CUDA support. Thanks to Paul Mahol for pointing it out. Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> --- libavfilter/vf_yadif_cuda.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)