Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* Re: [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage
  2023-05-11 18:08 [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage Devin Heitmueller
@ 2023-05-11 17:13 ` Dennis Mungai
  2023-05-12  1:47 ` Lance Wang
  1 sibling, 0 replies; 3+ messages in thread
From: Dennis Mungai @ 2023-05-11 17:13 UTC (permalink / raw)
  To: FFmpeg development discussions and patches; +Cc: Devin Heitmueller

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.
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage
@ 2023-05-11 18:08 Devin Heitmueller
  2023-05-11 17:13 ` Dennis Mungai
  2023-05-12  1:47 ` Lance Wang
  0 siblings, 2 replies; 3+ messages in thread
From: Devin Heitmueller @ 2023-05-11 18:08 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Devin Heitmueller

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

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage
  2023-05-11 18:08 [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage Devin Heitmueller
  2023-05-11 17:13 ` Dennis Mungai
@ 2023-05-12  1:47 ` Lance Wang
  1 sibling, 0 replies; 3+ messages in thread
From: Lance Wang @ 2023-05-12  1:47 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

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".
>
_______________________________________________
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".

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-05-12  1:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-11 18:08 [FFmpeg-devel] [PATCH] libavfilter/yadif_cuda: Fix build breakage Devin Heitmueller
2023-05-11 17:13 ` Dennis Mungai
2023-05-12  1:47 ` Lance Wang

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git