From patchwork Thu Mar 10 04:37:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp388543nkb; Wed, 9 Mar 2022 20:38:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWGQ/Sic9jwdyhckz5X8G6o66mFqN1GVA6h/YTBNloM5A48gUDDiGbIB6JBpLSDSUecQz3 X-Received: by 2002:a17:907:da9:b0:6da:beb8:fdac with SMTP id go41-20020a1709070da900b006dabeb8fdacmr2678131ejc.364.1646887105302; Wed, 09 Mar 2022 20:38:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646887105; cv=none; d=google.com; s=arc-20160816; b=w/H6u44yo5YHJVmIjm/yPotNXvDEoNuhasx5nNOU/++n1q4DPU7UrYsJFFE5MmJXCF lfFKdkxf6K5Hrm27sk3TD2IiR1AieBnIQ2qChySmnIEPmJUWBvEnGsodv6FTUmj6DwmH EIKSYZyCd3j8f6yPDcqy+Ko+El/ifOcF1L7Sl9ihEEiEpbKqh+oyRPOs0N99qHyJc9Sl jNTHZ/qVcRISzVOYw/EXvD29xPYYH9AnsRX6MZncgQyffaDtmWfii9G/pELhCfZzNF+i b+w0VWdAb1fzxo0CUMvCyZ5mnUUQEwuvnGjtarA7mPWRw287cEKIXITbSh/lH5GZzu1c eCow== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=S5NCr5trdlzRxVgdJ3upamTfAFtg5a6/h4y35lLPUOs=; b=W0nmfD4OQJR+sXH91bm34qEgxg3y88hp/7a9yvGSDvHWIlkbnGfHoPGM9/edjjuxbG G5V0j/5lqEZxSGVjlie6yBj9V88pF7WPh2oo8s4QCiLAFZC7rjb8DHazOmIyxYBKNs8c 2wt8jPNxJNddi6DWlbI9WQGlh/K/rz/NoXfMgcbGbhfghPTPeyDxFiG3Bt/qNhwpwQ92 HXS7DuBajfXSFhkpbD2GuoAmzeB4nxZBLrDVBJnxhwkZYuoV4ep5FvenRc1xRDOEXBoT YiJsza9muczDTL9sUQUI+940EasBuGC3I7lOID8AT2evhh/eLNsOG/AAzGXNrCE87D7a xD+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="w53wF/ZN"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb40-20020a170907162800b006ceddad109csi939337ejc.695.2022.03.09.20.38.25; Wed, 09 Mar 2022 20:38:25 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b="w53wF/ZN"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5577368B14F; Thu, 10 Mar 2022 06:38:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B98D568B122 for ; Thu, 10 Mar 2022 06:38:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1646887078; bh=3B7IlCjviu4+NehV1yBThYH9oFTbWtEa+rOTmcUSCgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w53wF/ZNANClIYxeGkA0OSOtx6gSiAjt8iqFpSCS8IsvEwwiqLHLBcdkWMg+oPg/d 6thR6UYNit+2DFwnCs69YLY5G6dlQuko70VYhKtWXrKrpA3jFr137qZ7VkZK7IVWbW t0WQDWOtxW4U3SeySaMNtzUxNJIMVQNSP0Qn9Oz0= Received: from ZHILIZHAO-MB2.tencent.com ([219.133.100.3]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 978084B0; Thu, 10 Mar 2022 12:37:56 +0800 X-QQ-mid: xmsmtpt1646887077tegmiqrom Message-ID: X-QQ-XMAILINFO: NnBlO8MsmACrJJmeeIMIkHpD3qPyFXNPpmD9mbq86yXk+BAE9fIS5hMMDzs99X t2Y8Wy264biP7ly77Qs++jbidtW90NJ9aXvQyQYLzH6bqeMSOYjQA20SbKogO2g3ISEDtgtI+ERH HDGLoYYK6kPzQYCTRsQkKwYxuuwurtAo0MoI8hpAXjz1cOHdSjfB2IerkLL6ULU+HcR9Lcq4oY2N kljmUx/n2UBaBA0OBH6eqcgEzSsZZvCcdP7ADyMTtNY83bYDbAcM/nBRsfLZjE/F3r1zymwbUYyM 9QWysMAbUZKQXku+3rI9zRPPUe7ae28JmT4gInPMfuwgTU5OohcCA3CebgHhuS3lVc/g1HskvbId 1y4aG2ljeBhoBnZuR8ixubxCT5QG6GE38/+E0v0wiyi58fyoJ946TesmdoalRPU3B+TDg5ydcojs eTfM/icubEeZouoEeHNxTHeZ8omc2U1tljYmiUH+XOb9gFhGLuKkDvO4FozueAUg3XUV1pLJHAkz TPfOkxbYBuSKuCjp0bSiUfdXUjVa/i8VU+G344jVBphmYDBApL24X4Nwn1vAK2JyEehn1u23zu/m OVvlKR0zr0GvWbhGuHcKkIzt8lqGrolS7vfkADvIbGkLP70uF1xVGYDPuKrkdKq5jOAJbhoyBu0+ kUgSLs6zzqmHsuMDT0QkENMGcNu+R2aeU2odyxG3cKtpZ5a03NRHpTL2zRuXaU42lCdIgex/ztcb lhyE1/JLl+lKotN4EhILy0guzRKOuK+X3jB6TIgjOQ1A841YfrD/yw8IJhlOvlOydYrm+kcnTczJ RdxqVpm4PyKzqYOZWGRsApOHxSmlQGvTUIcM3TlO7OPA3POg9rC6+eDav29C5X+8Sw6sc68QJuit 2wSp3mcSzHlg7yqykiIEGLaWOmdS1QeO54UF5oerR7sJptEUvaAPM= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Mar 2022 12:37:54 +0800 X-OQ-MSGID: <20220310043754.53262-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220310043754.53262-1-quinkblack@foxmail.com> References: <20220310043754.53262-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/hwcontext_videotoolbox: fix declaration-after-statement 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TRG8TSABO95b --- libavutil/hwcontext_videotoolbox.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index e442a95007..13f77a7692 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -161,11 +161,11 @@ uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, boo static int vt_pool_alloc(AVHWFramesContext *ctx) { - VTFramesContext *fctx = ctx->internal->priv; CVReturn err; CFNumberRef w, h, pixfmt; uint32_t cv_pixfmt; CFMutableDictionaryRef attributes, iosurface_properties; + VTFramesContext *fctx = ctx->internal->priv; attributes = CFDictionaryCreateMutable( NULL, @@ -589,13 +589,13 @@ int av_vt_pixbuf_set_attachments(void *log_ctx, static int vt_map_frame(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src, int flags) { - CVPixelBufferRef pixbuf = (CVPixelBufferRef)src->data[3]; - OSType pixel_format = CVPixelBufferGetPixelFormatType(pixbuf); CVReturn err; - uint32_t map_flags = 0; int ret; int i; enum AVPixelFormat format; + CVPixelBufferRef pixbuf = (CVPixelBufferRef)src->data[3]; + OSType pixel_format = CVPixelBufferGetPixelFormatType(pixbuf); + uint32_t map_flags = 0; format = av_map_videotoolbox_format_to_pixfmt(pixel_format); if (dst->format != format) {