From patchwork Fri May 21 09:17:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27870 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp343057iof; Fri, 21 May 2021 02:23:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwuD2lsOEgrswCzDgwhoa25wLQVGRtaixcD6eMca8Ld3apxlF5Ffn68SfwQOJG+VY6c0GH X-Received: by 2002:a05:6402:20f:: with SMTP id t15mr10120581edv.370.1621589026071; Fri, 21 May 2021 02:23:46 -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 a22si5011301edv.404.2021.05.21.02.23.45; Fri, 21 May 2021 02:23:46 -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="X/OwiFYC"; 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 9AEC0689888; Fri, 21 May 2021 12:19:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073053.outbound.protection.outlook.com [40.92.73.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFC69689907 for ; Fri, 21 May 2021 12:19:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KeWyEPxGG1hsBG+y359wyChA8FpkiV/ab/Xlxp2SAY50dCevk3RLtZXbrGVkuZ74yHGcFtnMxUM9kQoYfAY8Tflw/0RxNgdo02jpJt0IWurNC4F85lEJUT9LiNHQgiwkkJGFCAI4CuEmX+DtE5WiSBapskabbbjrC51+mts7Toz0CRMGEXJrnWxTl5sT377e9bQv+/5uXKPn0gGdq1wiOal+4U20YmkBF+qCGDhlcirH8czfYDmJcV6D2d2ab/2wXaUYClfFAf7tlX62814q+iAXosf22VD44XG4uoCl3D79PRsDXjvUDDScEn5X9XdXMDpkvx0GHe9FUjWJkmESjA== 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=v1H9sASl7U+KaLSlcchuTvburF5ulDB+XeEglbG5vy8=; b=kf7ixqz745POgGrswMFnPZpwfZKqF7ey72j78lFQYCM+Dj2MfTeHYZo8iv49GR6muo7ka2fMuoXkIGqUElAtpK+kAZrskcZ5du3LdVD9u+ofqVy9CkRjZS5O3XdFVJz6rjjHhT66X8gULmBJCa3Gi5cSFpI7vcEFo99/E1ETi+tn45jkBgwDFLsNx6pxnCvA5QAoSlDzd6xwxWN/ba0g4MGM22JjGDD5v3ir/jmow0FWwnyhiHusNtEd1MI4BUgXS//DkTt9tqNSOaNgKkXZgZvS6ifdN+wyUVOCss4Oys8LWkMIrv7uoFv/PA1P4fu2POZqdSjU4RRcFCG9UC8JHw== 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=v1H9sASl7U+KaLSlcchuTvburF5ulDB+XeEglbG5vy8=; b=X/OwiFYCD53h4m0tkvDvOGxTc6SDYdOA0GsoHTOC9CggLtyM+34pH9nc5DueieSL1l8DoNq3wHvmg1OhIYKneDe/YkK5O27I6H2HIdcYOGkUEmNTCkUKSsr6Ewt5IuXgCRJ/U0qhRGuhm6qcDyxN14547m2/TQA1QdhYKbBudcJ+F6JQHO+QGSKXujHluzYAldIX7lQ89ki4vPNqUpSmsFyqeLTl+sYDSGvULSVjUYOvPXYY1MB7V2BjgTyyiGLiplH9En4fSDyLU/Y6TPZ2m9LXid3f59bq44jDqgq9DOgwdqhcc2U0AUhMyXK41A4UhB3qdV0NOvGfc4E7Bkj7fQ== Received: from DB3EUR04FT030.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4f) by DB3EUR04HT098.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:19:09 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04FT030.mail.protection.outlook.com (2a01:111:e400:7e0c::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:19:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:68C7AD32885D93268083FFA6B83AAB30DB58BB68CE9398338520D8DD28FB8D2F; UpperCasedChecksum:F9E4940517FB32E04A186EAF0526BBA96D7A6F94DDA89D10D882BCA6F3B6DD48; SizeAsReceived:7782; Count:50 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:19:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:36 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [KLcD5sYdAltwd3n0LtLQG03TabZtEEuk] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-32-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:38 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b7a033c0-fbf9-4fc0-c601-08d91c396b68 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/M7M4vrgvBd+IenKLBfausjbMYUQGfIksHjGdobpoGiT9HSY8DZ4jM3/DVkfdA26LBSjsu1o9OK5rMhSmvyV5VWPvUtyEzPCrhFmSJvc9HWOOXk+fauscCKRg2Me9CFGGH97hdC35ye685/lidJmnDYQR/ZtXlYYOwbsU7APYytotG28Xzn6vN3P/+9sa7L9o7py/ZfOrD6OrwGPIfKU2PfLFn/sJAgpVuSlZDxeOnktZEuiYmgbz7xrgLb1MJ+OGzPT5YzbVMfohoVWTOxVPv5HCn5risd3s+CNYNpZ3f2C2Kqgm1271Xyy4hqSTBjezTyZO2bm//ZrVaa6GHtZ++H1BcvsgPniV0ozaREQbGqrY1Ktd8mgCc27u93tz26f2msYFcqUkL3YpX7VLiitbDOS7flpLWO6Lo3crO08Yc8AKPl701WfrRoVNpCXdVZSe/0BcjKwypqT3kOEZ8g0M5daPgWZJDfO7Ozp6GNR8T0K8k44ZkI/RBq9hgH2solLWQdVfXq5SF6jmPRa5kfjIvr7Dgf9wNwqd8hTJwzdYNH9StdhgFqjgKUE8tswfdnrwlpbHs1irUQuBDya7xMOYyutaAWpaYwGkbeq3JSMsSE2Z+N2cP8TWgi4zZmXUKPT4j7pXR/d9jeFsqxJkrm+AK4WKJDT5JhFYIej5pYcoWyyDCxCB5Mr9lcZAHRu7oQs2/28cHM39BVZl923hSGkdg3ntfdDOFwY= X-MS-TrafficTypeDiagnostic: DB3EUR04HT098: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Te4s4N/cQaH1mdPlrFCEHcMxDzznEFDT/N175KmuGSezqngDtEzckGkd/lVONhu4d5prIG6pKxlx9pebOifE1YVTu9itJ+hMx0nKkgpnBglv4Y4TemBcU9XYc3VT7NyxJMugoCIX/PoegnpEGyuR4Nor+PX5imqX3P+qFT16QOImbn0478RuC5wSUkchUgOPZWpUCYJ0ABgR3ZEt29IpysC2Rh9FpYHD5L/r0BwdAiaVtfScc8VclB1Hjih5MqSS8gtYkMGqr2+z2mu+FD8InCHVqnc/xY+tNnmXFxvnPhFDZ1BzXImVQYxAiG4JlvXEhWPuU7Dmls/UHiBv/Cm5CAVe8D1hItTZig10XTAPo3Kee8p+WzvaQRGeOZt22o0yUPv5OrQqj7G5fxv8UAosg== X-MS-Exchange-AntiSpam-MessageData: hB5dR5cMvSlM7LT1qw87bzLlOIH3hC1oHyfjcKGAcPAu9Kfbe4XXII46J8SgKZElDzY2Pd1C6uxKkpeOZjeBTrlKn99IAcxrYk52n2MD7Bi1s1kHlFcvVgE7nOG9fK6n8kCCmq1NtEymyReZ02+n8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7a033c0-fbf9-4fc0-c601-08d91c396b68 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:39.3136 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT030.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT098 Subject: [FFmpeg-devel] [PATCH 33/39] avcodec/frame_thread_encoder: Remove redundant memcpy 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: Oof6VvTogAsv In case the underlying AVCodec has no private class, the private data of both the main as well as each worker AVCodecContext is just zeroed (the codec's init function has not been called on any of them and without a private class there is no way to legitimately set anything before the aforementioned init function). Signed-off-by: Andreas Rheinhardt --- libavcodec/frame_thread_encoder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 5d14442c01..b3e571f4b0 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -215,8 +215,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); if (ret < 0) goto fail; - } else if (avctx->codec->priv_data_size) { - memcpy(thread_avctx->priv_data, avctx->priv_data, avctx->codec->priv_data_size); } thread_avctx->thread_count = 1; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME;