From patchwork Thu Sep 2 15:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29967 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp401251iov; Thu, 2 Sep 2021 08:43:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQZwusw+07rd1KMuaoHRE24wam3/c7J4Q1mh/lfh2zkv99GuPSNOI86SKAUe/uuGiPVHtu X-Received: by 2002:a17:906:5953:: with SMTP id g19mr4501826ejr.443.1630597420419; Thu, 02 Sep 2021 08:43:40 -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 s18si2133016eji.655.2021.09.02.08.43.39; Thu, 02 Sep 2021 08:43:40 -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=KtXsSgah; 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 DA52968A62A; Thu, 2 Sep 2021 18:42:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064091.outbound.protection.outlook.com [40.92.64.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ED9968A62A for ; Thu, 2 Sep 2021 18:42:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dY9BHEzKES3wYz9StU+pxYNlpg/DhhIXBHD3CJKOxqx2ix3MVlrX/F+mfxWOYfC3cqpHS312NPOtm7D+rZL+VCfhDMWZPxVCpbZSn56Vs5BgUiEFicPgFqmf7OlJO5q1aB87SuiKO7cEZSW1U0HplB4HcOzI0jJ4UqT7rqa4YOZw148UyF7EderJk34t1wPpZlAydb5ba9ulLM+vubCjvmNmutTVFsEYK8RNGquCKY7QQNEsPKB12OjwzuigtEkUQeF9w7y7p6ff6OLdAgQ/nMPC8NDrukIjEqJFpfJXC8gZ34Kbt5mwlRlyR0DNrg90NK6FlNYy/rqqU7bH7TWW9Q== 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-SenderADCheck; bh=W3cEc1Of76hrTthnnnjwt6uBkfhghSIIaE9dp+0WNrg=; b=Q70RkBWeTfRo6XIW4hyQ5OW0ip3QRi7pu9mel6ElXyi57yka8j+qoBQhyL1Z5XGO6OMPc5+gBUM9ALR7lUtuHQI4mRNDpx1z326tPZrvg9MqjPTRHm7f9HoMXcbZvDBCjRfA4WcAqY2KK8jbe0MO0eeqNcXjoE3LT1Vg2Vp3/Dlxk1VVtT+t5TgTuF0OtUBZKksML9IX3MZ5tgR6GwM7m9jxUZzPh5uSBf592tZ0KxiagXguH3KYfxI3uNIusLILzzQQuEK05GnbIqURTJVRMtq9T65WLMSKrTrX1Kio4aLAJrQFTxDtbcEGb4or3YYBcSJvPMp9Ol2NBNCHYxHDYg== 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=W3cEc1Of76hrTthnnnjwt6uBkfhghSIIaE9dp+0WNrg=; b=KtXsSgah289AuqPtbU6zO8ztw7TmqG3WyoWFPs00W5j1kx6uTHtfdjSX7X7PAvoriBh4R/gdkxJtmgFnBeDf2MBgEQGZGDntcUewBHKDOeIfcJox80zEsTRA3Vl30carbyE+33PKkoedKxeFh+hynpXzteChVkibPdQLGn0fJnIUEkbu1bBdm+zZV6PHN1a1nkTH8FJaSmqEbk3Pc//3JDHXVdrOuXIfj6hTGSaJ/7O1qv17tUsBEuNXhPH2f+FoY4hT9BdykPVmtTrY+O0FveNpdog6TwK0gfW3xkx/vp8RaiNVu9gCYHvZKGXotMLKEE8DMg1UroZ9TuZRhFMJLA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Thu, 2 Sep 2021 15:41:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Thu, 2 Sep 2021 15:41:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 17:41:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3fHCJGTjowX6lI3y7XzGPuoOa3d/oQAc] X-ClientProxiedBy: PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210902154127.2571616-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20 via Frontend Transport; Thu, 2 Sep 2021 15:41:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 860e8b2c-af92-4e67-60d2-08d96e282e68 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRAro5Pl0DReHj5zSq9SRg28rtCFKKu308u8FUaT53qoQcazxtaOQFIC1M8i4uAiQ+FBEb1rsSgKSVypBB3VDqu9lY1YzbDkoujm5r3wF2aTD7d+P2lN3JsbwUAJcKcZ+NlN1wVlOVSWOEgxVt9oMsggnqywh59HZ6g7YIYoJb3c+ijSAIvZnBTTMusCUBErVjkWfv87gzYrjri1eVJ8J/sxqQ9dXFHiC0f5xRPTQ3pmmsjl3AaltALizjN2XqNS55KRIA6X3ONmxQMwTiTu1W8VpWcCAtXIVvAPyrEpVep9zV/6u0atCnMchmFjO8/ygMdrJ4EbtlBbIDqAZMENcUoSP22z5oJA9ICSnugJ8RyVaU4K/YkYlL7AP0fkebl9sJl1w4e5p2K/j/Fj/uYipEFGpvzfXnkq15MX5LchCic4tQUqxHT9yAJ75A4DcCTvF0ZO39TINZgVJQU9zY7tkWDJWmY0I4RpTHrwUgJox9gP/rHr9DlsWKcRklw2ulgxQIh8DXkBhf7+Jxw/C3IYJ0UZ5gqoFFs0DpF7/2ePH2EdMZ8SCVzxnnc9qV1/chn4NHe1GBsRdqVpPacp93ksYsFi+g5LqQejyn7U2RMlv9/7j1pSFY1JHGsQNINfb2QfNEEkIH8jfSBHovvhNZwaLB41iVWCch/Bd9wCosf1gIk+KEWSIqStcP1QNP0GxEOcI5UOWHZl5X0xyRU+IYZHqEyLcAHYK5MLMYDauAJOMaAlFcQyhakcfXK7BMEmV0u7y8= X-MS-TrafficTypeDiagnostic: AM7PR03MB6532: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: csbdeAflxy0tu8qItX+Z+o0iAAmcRYkoDUTK3rQRQ+WBJj9zeJiay5J06X1fEYDX3eNpswZ/xNqTZUG2ZgOrqkDxHKSKCxUvGbV/2FN+MwwmUK9PioZhn7fn7Nn46RV7uoZ0hYljGO4A/kDr9cJbJaMEbnBztmJ1VdThvemcOS4VzvXyf39gTNv1ghnfHiDM7Dz2gP819UyHuTp33wODU3Mf+2WcWkcGG2FjFsxU1rOHSbAFuY/hRyonLzcd9KWWPDNjob6bf2lYZU6Fs55Guz6QucBOQV2y5AYiYGVSIpRpEUMusiO6XUSvyMPRYDvs9GLj+6GVq7iAcY3xXWRfDfMmwXcAgl5oWNoRldHC5ofAsfiIBhuTDslZoa9ITMs/k0J6HMob4E8yjzmvP2Ko0lSe9fiBk7fl/e0C4hZ5jrLlx7W8udBGTFO1fcMRhhTb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i73KGC4UPRLvD8+bIkLtkMqSXUkiPLtKkRrNSk/87GNy0B7nFRhkuH3kAouwvOUS8NYaLdbrUW5Ro8unopg1AoNy8VaN1is1cfIjbOQKmEd8zzN3l0VbJbyc68OLanA1PTl/pW1X52oOwP3Ym5Avwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 860e8b2c-af92-4e67-60d2-08d96e282e68 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2021 15:41:50.8554 (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: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 09/13] avcodec/frame_thread_encoder: Don't shadow variables 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: TkBHvt5YlsgK Signed-off-by: Andreas Rheinhardt --- libavcodec/frame_thread_encoder.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 8f8294374f..219d65cce7 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -200,14 +200,13 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) atomic_init(&c->exit, 0); c->max_tasks = avctx->thread_count + 2; - for (unsigned i = 0; i < c->max_tasks; i++) { - if (!(c->tasks[i].indata = av_frame_alloc()) || - !(c->tasks[i].outdata = av_packet_alloc())) + for (unsigned j = 0; j < c->max_tasks; j++) { + if (!(c->tasks[j].indata = av_frame_alloc()) || + !(c->tasks[j].outdata = av_packet_alloc())) goto fail; } for(i=0; ithread_count ; i++){ - int ret; void *tmpv; thread_avctx = avcodec_alloc_context3(avctx->codec); if(!thread_avctx) @@ -221,7 +220,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) if (ret < 0) goto fail; if (avctx->codec->priv_class) { - int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); + ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); if (ret < 0) goto fail; }