From patchwork Thu May 11 17:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 41583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp4792365pzb; Thu, 11 May 2023 10:14:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4nrywTX+PAYYLO2jT0XDLVjqBDd5VgSWAWsn8uwxgHq6mQWGvUSYimAeDxHkYbKTFGy6VT X-Received: by 2002:a17:907:97ce:b0:96a:4bca:8408 with SMTP id js14-20020a17090797ce00b0096a4bca8408mr4201929ejc.60.1683825270826; Thu, 11 May 2023 10:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683825270; cv=none; d=google.com; s=arc-20160816; b=drZt3NIt25X8a8XHV4Jz+LgvzbpfY0Zx+1VJ1pOJBjiFCB/wmb/AUmaeX3vbBVfsLX FlL4IuIfq39NvELEKZ4cllbStjEj/Kq+OlojOMO1AEboyvXCst8YZAN4fKSUdTLtmylq DYIz9WsseryYy4u+MKjHmelxvDjUCEzkRZB48Xvnr3hwpCcxFRo7R9p0O08MW7XiLYuS S6JqLPeQd+R4HmKQOkjlOikIfgXtwlG6Gl3jW86p7sOnPRx1R/I8sw6OkCljWDVHuZhr OietdgMshL/UBp6Q5V4E1FkhpEcvVxhh+9ioG37nvnIOfC/qtzRg2uCLF+1lFSA9Q++B TOOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/K5/0f2jVcvi9SmF4WGb7YDF9K43XKl5ROoNOTpXKBw=; b=G/mh5AaZ49CP5L+Mg9zJfa4eESovJjwwNMhveNOUXciKHzInRt0Mahs0VTgWbi4h31 PGaYrcr50/zFUCADOsM4fQR9owy7KEIhT9v3obwhosX6G/GGq06eq5FLdyGkqFhdmw7Z WMgM6ZI/80yZl69aoMtrj7aWKyq95ENUJo61+cmgsTAnQltA9BrZW/1fqYZxVyt9hDeJ yA2//kArHtU1XApE3U5/fPCVwk/4xMWypczXA8/W8W8do+MzNXEyOfrjlw4EeetuapQi WXnPR8vIF2DCETn/10GNeunzZL+nI/vfYmIHsuxX1AUxLDtTaY4gQ5qlWzztmTfVGNaG 3qGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Gv96Y+Gv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w20-20020a1709061f1400b00959b80042ccsi5833205ejj.789.2023.05.11.10.14.30; Thu, 11 May 2023 10:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Gv96Y+Gv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 485BC68C126; Thu, 11 May 2023 20:14:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 223416898AA for ; Thu, 11 May 2023 20:14:21 +0300 (EEST) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-556f2c24a28so11464957b3.1 for ; Thu, 11 May 2023 10:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683825259; x=1686417259; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=99MfA76KbLB8zfgD/Oe9VOWiOm5LJgMrm0eNS+zKrws=; b=Gv96Y+GvB6LVB6ute2rvV4+Uiy4HqhLnMG0AO+6ZMCXEeg0w+Wx7Bmh3X32lXRfM/t AynmRCRqQ4zPllrk7ot0SOkIaTrnokq0iXOV4MrvImb8ekdOkDFWomyFqmrezXIJh24e gILshIjUUq4Xcb4UymFG/7OsABoKzXyXjBuM8Jpf0dxabOI+Stml/GustGhZr7iMFlqB ot66Tw5iNobVKZPhorphW++3H6jE7Vk0B4iw+R4ZGmalZVeNIYKSAlukilZ9xh8T78Rk 5fKc2whQ9v7zxIUv3TXWjWO5rrLo6Jtl2Tog9jNc4htva2IrPPpYJmn/c2F2J+ngnqDc RMtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683825259; x=1686417259; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=99MfA76KbLB8zfgD/Oe9VOWiOm5LJgMrm0eNS+zKrws=; b=MarN3AGoe0/08o9A0o+V6p+Bqh/sNybMZ77cXjkEvXUUQz2F7QO2RPadcmtAQ3+2Vo jtGkunIQLCKbNsFRSrjSPSuDsEXTixcBkNFytaD8eXI7AsBCFNj7OUfQJlG/LZcEkud2 nT8hepRcr51q2EqeqAZZpZHnwx4TOs4T/Rf+OBZ0lKtsywZqL2jicNbe5unB5iIlN0/d IqpIi6t3q1oTT1X3VAFNbGtGDmA236/Vzz2mvnCkHlQHJmp1bkXTEAA0SD4QXG1KqZaZ SEYiykpnuMKWLb29MjJwQ9Bh3bxS3By8IiO/xOCHH+OKvL+GvRz6eZm+3Ol8UzX3El3U M7cw== X-Gm-Message-State: AC+VfDwIBWacOpDbw2brkynfu1lDrCiMd7d/lQy7c+ynG2xMIUyd8QfX IqdGC7Zihbhf9uF1ps6woJ/yPQPEl/k= X-Received: by 2002:a25:6885:0:b0:ba1:d1ed:feb3 with SMTP id d127-20020a256885000000b00ba1d1edfeb3mr19714117ybc.1.1683825259509; Thu, 11 May 2023 10:14:19 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id s81-20020a254554000000b00b9ba6a3b675sm4593318yba.50.2023.05.11.10.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 10:14:19 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 May 2023 13:14:17 -0400 Message-Id: <20230511171417.32206-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_yadif_cuda: fix cc_fifo typos X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FQ3WL936QpJZ Fixes calls to ff_ccfifo_freep and ff_ccfifo_alloc that were called as ff_cc_fifo_ instead, breaking build. Should fix regression introduced in cecf35ae3e997dd884295d692aa6829462394132. Also use y->cc_fifo instead of s->cc_fifo. --- 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 f3f0b56768..73f04126c5 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;