From patchwork Wed Sep 21 02:00:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38128 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2323238pzh; Tue, 20 Sep 2022 19:01:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5CThzbt2bN4yjjQ+7Sukm6n6aWXFl2c3dxuXxJsFqdYASpz0DbwBpTgVzJlcxspRkbyckF X-Received: by 2002:a17:907:2c44:b0:770:8623:66c4 with SMTP id hf4-20020a1709072c4400b00770862366c4mr19630480ejc.3.1663725669567; Tue, 20 Sep 2022 19:01:09 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v15-20020aa7d64f000000b00445fba6c607si1021958edr.140.2022.09.20.19.01.05; Tue, 20 Sep 2022 19:01:09 -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=@outlook.com header.s=selector1 header.b=sWYypik+; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AC2968BB26; Wed, 21 Sep 2022 05:01:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2080.outbound.protection.outlook.com [40.92.89.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3391168B999 for ; Wed, 21 Sep 2022 05:00:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WsfBeFL4a4rrWFi8Bg8+IpSspFFMtKxPCbP5LyAb64X8rHxHo8m++Xc/+YfWonddClHfmsm277Y6cmyuSuRfR8o3pZ9Hma5BrDNnwPLaQfkycnAh6bHhjgnu3MNov/F3WIreSXtRV1TWFTKnUFBk7UiiS+oDcNgky6PZTe/5dit0JuBNe2ZiCT9hG/opvF6dsOJApMETKxeyK7QQ6YJsijttVl+o9oOfvkOa9cVo54OhrZ+inOKWrw8AUskTz1FwoEgnWMvCREntBPbziy47D3qtkRjin5JXJv8e6MGtm8qq+wGGVR3ulcWrMNQveGltGemRRzeQqwmFlcIZxWH+aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ep23bhMcE4IR41Da5ib8yT7O17J5lprNXZUYEpgzK3Q=; b=DLGx6xHerJ2KAvCwZi547rxzTpkzEdlmuEmF2tKga42cO55b/xIkIUlwfW9QFO18AQA/ueZPp0VqGrIGvTT7o+eG/PFegplcn9fkuaFt3+SQwoUw6aH+/38RnLZye+7iPX8qf+fteK2H3p67uLMoxc6fNF1p8siVPMURbpEue5dneg+W0L1UQiE6gFbYp75h/jMdhimSPnx8eTLrF6jYbDn3HJCyhUVWrL+TP4n4tSRwAY1LmTuBmGEQ2RctGfqOdix3vrADZJUoNnGlEE46NSD77pcr0s8EdpD1MoC/pFG6i03k5ztxj8XbGuprvdlkpR9RbUKAzPtWJf3x/eoxbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ep23bhMcE4IR41Da5ib8yT7O17J5lprNXZUYEpgzK3Q=; b=sWYypik+prv3b+BCvFNPKDWoJNba8lXWeVlAaqNdGKiXNfO61uXfZwH8b8rv8j7xc0iP+zpUozut/L3Fvv5UQCaQN3QYJBQaT5nfBRItEM+6cM/+sWvBJLl72HbAuEWFehsmqLrb7xt6WqSPxtG0kdG8Tgf8qClmqiBGN3lSIWTUPRbwnAnO9ENdGdod0InemBgr/DgEPOyk1Gl7veDe1AXinDgqt8SK6eaHKfrcK7RCPrZATkEIpWum/k/J0DkY8ES1lvzjh3crdPZZWJtSjyBSIxxMWmiUftYUcwgMtA9fppU3Zl5FPRVmuMl4ZHuYFqXJc30T4i9OAlyYR6Eg3A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0237.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:276::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Wed, 21 Sep 2022 02:00:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Wed, 21 Sep 2022 02:00:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 04:00:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sqKLvNOY7iShLR1PEUImTA1FP9Zq12ueEDgdVpQh1a0=] X-ClientProxiedBy: ZR0P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220921020053.392921-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0237:EE_ X-MS-Office365-Filtering-Correlation-Id: f65c34f8-d713-4eed-b106-08da9b751ebc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rOHknB/H9sp1+qvq7UfujgWCPO9TaI+ZqbPjMq2neg2PdxG7ifo/P4HPWhQoJc1r66IOt6tog7OP6UX+IPZQIeo0mlZuwTD4AA5MPJ6QzJixIMsFsBu8catSmY++1Pao1s58Anrubk1HnrqschruSBNPKGzH6A7pHRMXkWhyuRk9zHChg6cx2pSSuele9LxzKNsFtvODVVSOvqySCFH7ItQufLfm4iSQYLchENLaN52mh3gxzClmhR/akN9f4nrRtuwXz/OPD+EHLM4BHrxr/zhKdvxzuu6R3tHNSpZ+6TnE+/n4jbamdjPjughgiavBhBIyVtXyzfDaheYXOArIgDVcLBw7cXz6guteu82QW+GHCxzNfrTifgck9qrTcPJ5NYdg3Y9bKE9SX4aHJStGA+f8qhVioQzLYZvQtmQg1SeOGMJhN1IysQRhyDaQ72vsXouEe7iZ8tF2s80Lvg0rsEcnY5/FCug2d+2DDvCiq2vJHQeUY8bG9GqmhZkhyZFZiLCSsL8vIlNiDUX6Gmwmb4eVp3/pFeOZQpXdVtZG3pIhI4s8JNoEbt2BZlMHi0uJoiENOf7OVlSlV2qlPCzydX1ck8UO8rLOxG5IGojiBg80D5pnR9R7ZaeMzTvSUuAwfHQtMQmiPhRM+p7Bvt9GKI8+Dv3i17O5CphZZo4AJmWTW2ATXmT/IO+X4aOjt8QwtM7GTaxO72/fgD+E6esJmrNBmNX3X68HQe7disB28wQ5v+TPynbUjI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iKv7/XdJxkrLAvwLd62VGq1YDTEredNgFwRrnA+9T/IplUg+M36BbserISPgVJSHZ1q7FGjOUQKCrzEaggcgT0fn2e5pCWBQUpHtZgWKptppyOYy/+ssG/Hv6beln+9WpDrJ9BJ0GVkdfuPoCKmZ8acnJ9MeUY96oPUZE0oNQBdalJzdU28LCd2QvxwMC8zl05af+jhiTQsQYxpf2318ik00zBXOoWGeUk7gL/t8+ArtizuVraudzu9TsO2eqDMWS+NrryKudASnt+l9VAznGgb8QFbAZQ7pkfilSS0eamYMFBXKy60wxqWg84uYEElInj44CmlY2DwpM9InSmEw+todZlI9NWKIscY5mbRSGqZmAwGlH94a9N9GSqbbVbNZcwO4jmqwg2sn+bjJ8Q2IV6vwva4SKVnqNCNVLR/7pN8sPTBS4KCD1VMgnSheour7ZkLDkR4exdWDn4qlcL4dKzAoOwvXVKTh2QSqrCD2zNo4gpFWmNxj01f1fxMxS9P0apltPKnNNB7GpSGynb/K8E2DfNraMAO7r9tkuRKUj8n57CDEB+47tZycJW10//qfGIR7eSw5tsHPxw5givQl7RxDDUjd44VpR0wfJqRdfu1l4y+QnSt3OYyDqOo+I9LoaXaqokiaCzMBfhFpXe+b9g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ghVBFEXtywzA6p7yLoLQkXOFZ0rjNQRFgphNU4NSa2bM5CZMk74QfXQ8hFihYgO+SwsydtN1I/JICGZawX6bTes16QScEFpL5M/YrAogNJSexbsgri4lIIo5n328ExNXBBA5/hMLYBvsM65efOi+SmY7QQUXRXoXA1u7BdUYBQVak8PqYHyPXuZWEDR9gjMza0hrVDSOOfPthe7LZ0AQr4MWyrmvhzhtsvZEPIt/nz7mipmcXHxpZe7GDmAm++ux5pfc9QZNTaW0kMGfET0TSK6SMd/7mjECDTqwCPUZYsp843QUHmme1aXvg2z8DzAykM+UqNa/L6oGyBcEG/3FG/g7Fc8N76J1Jd2rSxJ7Iuyp1yhUKmZhtWmctINNCzhRrnYElCdldh76AxxwBMOb7fCMGop8D7K4jnqyMcZz0ATCCkF/G1WSdAH2VmAvacHJNLUJdy7So1JQlm1OYZ2yLiPM0z0gRBo1eLYWUiQNAIiDABDqi9Gy2vBNAvZ2O3Rgq9X70IUuYt+eswzNyQ7K24rgP0fQOrgFQXtdDRiOUSnlQb3snaltw294u/GHwuvoeB462zIxWrI+1DxFRsGWYQ7DRjLAKWBjpI1MtJmZpeRFgboDaaAuM25+qO3tE0hXiPr1HzkUiZZeAkaJH5ywoV1+K+ZhL+6YlWSyTkwiKxw1QOMl/Kr1uO+tAHEwalDM/pT/QsuGI2H92QccQG4E2MpCMRHrJ7TCKxaHO52Re8TCErnACUj2ROtQoRFddWwqZbFJY3IhuckKedicZ2dKlMN6wnAax1DPWd1e/UFA5H7gG617NAV94RksNNcs4OV6hBplvyR+IV/5WMrTIihTLwQxp1reYzF4vI4/cVTD0qxtYHVkbe1j3wnXYCqCfFeRcmPCET8Cy4grLoakciXoY4Za2ostTAEhecVs4ejz5brwNrYkU/A6qyC802DMnYz9ux2LJ76Nh1iscf0xsZI94hQ7zSABdGMe6r3mb1ywK6MCQJKGsBZm/H3Pb+oAnorpO59vk+FfW+7BliXzODkWdSnn8KDVWZqTYuN4eTav08EXN46QhBcTCpTXysp+CeF+P1qhU5XjXxRExvxHZ7HmW4DuioRrn078/XbnW04R+sCICK6IPsEoPTiQSxMkf8tIesoiDntrBuy9/owyTYp7eXTPLZ3cHR05TgCYZLpjei/kHpntWK2xyH/6pj4BHKmgHokdb+KjrJUaGPgsArLDEr6K99qqHiLVrnc+cUVVkvgmGXw3IaG/2NJbWHULQJ5ohr0URBpDZRIG/LN0AdajFSGqqezvuHEnguHZTkix3nKyl2Q1ttKS7MVFo7bHY7UG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f65c34f8-d713-4eed-b106-08da9b751ebc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 02:00:55.7382 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0237 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/avfilter: Make ff_command_queue_pop() static 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jJdF/ZO99uK6 Only used here. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 +++--- libavfilter/internal.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f34204e650..cc5505e65b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -78,7 +78,7 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) #endif } -void ff_command_queue_pop(AVFilterContext *filter) +static void command_queue_pop(AVFilterContext *filter) { AVFilterCommand *c= filter->command_queue; av_freep(&c->arg); @@ -780,7 +780,7 @@ void avfilter_free(AVFilterContext *filter) av_freep(&filter->outputs); av_freep(&filter->priv); while(filter->command_queue){ - ff_command_queue_pop(filter); + command_queue_pop(filter); } av_opt_free(filter); av_expr_free(filter->enable); @@ -1494,7 +1494,7 @@ int ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame) "Processing command time:%f command:%s arg:%s\n", cmd->time, cmd->command, cmd->arg); avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags); - ff_command_queue_pop(link->dst); + command_queue_pop(link->dst); cmd= link->dst->command_queue; } return 0; diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 36969c442e..aaf2c6c584 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -256,8 +256,6 @@ void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts) */ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts); -void ff_command_queue_pop(AVFilterContext *filter); - #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))