From patchwork Mon Jan 9 12:50:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3066116pzb; Mon, 9 Jan 2023 04:51:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXu3mlFtExM2slKxlE51kIpFlm0DKbgDcup3Fgzt+Lj5a9dFORvkPqGYX3OcPfJlrJF9ErOr X-Received: by 2002:a05:6402:2b93:b0:47e:5b70:de79 with SMTP id fj19-20020a0564022b9300b0047e5b70de79mr57903177edb.17.1673268670625; Mon, 09 Jan 2023 04:51:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673268670; cv=none; d=google.com; s=arc-20160816; b=hdhc82axvuJKkvwMrx7Mxzeywwxwp4s2KYB8U22E6m30KFehKrAuQqMfw6s45yBKr/ Yvv5byE5L9ykVC5sjNbWjTjcozexgnKK/D83BYnGeUBDkRxMyROcYYBDtzanGpiPOY52 HOaznnziOVLJwRqUE0RIKzC4rXbqwOTUSaL6g3nv+K/2IuhBdns1OZwM5DASWQwq9gIX KYvplbWgP3UzryMtJz/78E+BjrzrDaRbLhjW1A64jHxq2+wSm3O4/zN021RpgcRYD8RW tNh8FOAO9pXRFy0fgtToLjC8siUS90OfeZi9p0uQRsrPFV1abUdO6Bln3DJDHu+1vaoD i5Cg== 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=8INAnen8aTZqf0L7UcPYQq0hGxY6yJYoJKdJ3jI2Gpw=; b=bqzoqPYeBCUsgOgiFHokOwKTM+Ztgm2Wm+z8c42EOOWXFxvJ5SY3TF9qoP1Nc9f8rH GGp0lvkqcV/jzls6r8lkk+70tBLEVyLg/7m/1qFrN7HSDkNwKKbgIEbF9fUZZPGNtBJO oRC0YX+KWq4FT7/+NJ2gelG+C7e9Z/ZcI4iCzRwYcvApF/zfC7Re8icnMWkmsh2YrDkw DydgZg5Mu14v/vklQ6sY2nzH4DiEEWSXwWiraROUtbLwOg8FhJr03vZXH3rxNYZvvykj hHKzO+mBKqSQXY6G37Qv8kPxMv9WrAzHlZKK70N3kgIGXGvPznug4oCx8/T9EJaH87CY efcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=hTTv1HcH; 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 l13-20020aa7c30d000000b0046b32882b04si8246722edq.440.2023.01.09.04.51.10; Mon, 09 Jan 2023 04:51:10 -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=hTTv1HcH; 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 7DB3F68BD25; Mon, 9 Jan 2023 14:50:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E19268BCEC for ; Mon, 9 Jan 2023 14:50:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1673268614; bh=fIFjuZPCoSEcuFdilCZSXsCEgU9nFwHxfU6PGAasVj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hTTv1HcHysQUfll40lGW7qlC2NzWmEPyoB2G9FSm/jTnfPUrTZ/vfEiPuZ6JH7+YK j+ZTA3dWA9xEkm3+RotFMIfYU43vZDLJ7MdcHRiQg/QUumM2tzyUcuEhx2iQy3ZK1L xzw/Bu0lWvkbXNUB9x5t/7kbZHui4hdiIe2QPFu4= Received: from ZHILIZHAO-MB2.tencent.com ([119.147.10.192]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id C898A4CD; Mon, 09 Jan 2023 20:50:09 +0800 X-QQ-mid: xmsmtpt1673268613tmp6jw73x Message-ID: X-QQ-XMAILINFO: OaubouGXmhNzl1xC0tZNLeAu3Mn+sTg3FVFvhApvRScyvgBw1rk0lDQCrG1/Jp Dn4xaIalEJoh/riPp1VsNAT63TeoiEAHimcNdxoQvypiv5LddEgnEUObU2LAEDhy9C7rzn2WBNB7 VdFFQUnVVPXlO3WxRLWWMDVIlR6s2EaEYtdDDg4ZcPzwxLri2r2wQGDpGKDDlPcALQzrsUnzWFvx dVVT4JPaViW6atYWBfAedWE+RQAS+rHfPu8uFWm+Xpc6a5Eh/nKQuEgic/DC/K9XnY3ofME57VT4 NnP0SgMqRBNAq/j9rjMKtIT2/YNg8RiGgu9N6SFgfNk3L0ZLi+GrY0Xp90TE6VeN0V4auvwc4Lnk rDBAMJtexYyugen37e/aA3vuA3FcCrovsvOF1o4E439ECvMghUrpulbDwLLetB4nZXLoLOBnWE8Q 2QY/11OfaE5OZb8JC9QPNfhm3HLM6kBWvyDhlxA3WK9UoyQP8GZBjCDx74iuCPYvrB3rOktHP/2B 9QzB98IFzK+fD4nK72J4B5ELQzG5SY14JPDshHiWEfTLWJnejg/CDKtrVPjPTc7KzzjwHiXvWxuw E3N2F8TU/8YWhl71QnBgmT1i28qERPKfG2v9tBKwfHGMgZtdk+HkL1kZ4A+usBkHNI5U+BMaeSaD xu1/PEs0X8Rhw1ZwkBtKd839axPt9lZ9DSfe3hcN2r5bJm3K1i7TIaWSp7ugQwJHGqn1V2t8+k8G 1Ujqy21L4p3zZ8a9hZ81wIyT2l36vbpbiky4vSictFVIVjy0M5UOVa6yQnKZFy9Fjw7VoZxSKV7C B2v/tGFnmjj0hrtegAIPOGUp+olsUDWimltvSIVHXPUXQhgp1ntn22Yrh4hbdqhWkkFj/gWMzhjA Sroh6YbrKGhY1dkSNp/dWPEFUiAL+BRhBiywKYTiWS+ZvRBus5+laoKA6s9/FoE5VJCT434syEYM iwroBE8rcMjGThpIOTov7wwIxPIEbfax0uGLOhW4bFSKf61Wr80g7B+Pz1vfN0 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 20:50:08 +0800 X-OQ-MSGID: <20230109125008.13336-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230109125008.13336-1-quinkblack@foxmail.com> References: <20230109125008.13336-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/videotoolbox: don't use av_ prefix for local function 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: 7bbDty/5IpIO From: Zhao Zhili --- libavcodec/videotoolbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a3d19c4c63..e42fea6f32 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1173,8 +1173,8 @@ static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) return AV_PIX_FMT_NV12; } -static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt, - bool full_range) +static AVVideotoolboxContext *videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt, + bool full_range) { AVVideotoolboxContext *ret = av_mallocz(sizeof(*ret)); @@ -1207,7 +1207,7 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - vtctx->vt_ctx = av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); + vtctx->vt_ctx = videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); if (!vtctx->vt_ctx) { err = AVERROR(ENOMEM); goto fail; @@ -1392,7 +1392,7 @@ const AVHWAccel ff_prores_videotoolbox_hwaccel = { #if FF_API_VT_HWACCEL_CONTEXT AVVideotoolboxContext *av_videotoolbox_alloc_context(void) { - return av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); + return videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); } int av_videotoolbox_default_init(AVCodecContext *avctx) @@ -1404,7 +1404,7 @@ int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext * { enum AVPixelFormat pix_fmt = videotoolbox_best_pixel_format(avctx); bool full_range = avctx->color_range == AVCOL_RANGE_JPEG; - avctx->hwaccel_context = vtctx ?: av_videotoolbox_alloc_context_with_pix_fmt(pix_fmt, full_range); + avctx->hwaccel_context = vtctx ?: videotoolbox_alloc_context_with_pix_fmt(pix_fmt, full_range); if (!avctx->hwaccel_context) return AVERROR(ENOMEM); return 0;