From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1A14843486 for ; Sat, 13 Aug 2022 15:03:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A41368B866; Sat, 13 Aug 2022 18:03:21 +0300 (EEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068024.outbound.protection.outlook.com [40.92.68.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9B3768AE59 for ; Sat, 13 Aug 2022 18:03:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C6wKoW1a0ZBlQhR1/UgETm5/XcvlKW7HrU6Vv023kcjCtwQh0cAb3fqu+TSogQbV2cEDNpo9YN3RTqse6BKTVW77BDwKEnKfjMTJkI3VnsX+YidnKf507Sqenz/9QFyZb38KEJ6Yztzwp3sSWEDsfjtmZ9Py69Zgk3dl54pndx8XAuBMnJZniFZZlq5ygcUwzbZ1Dz1S4n2BVEt1YL/UwyhO5rEFWx9KC3tEizRplj4j/NYtl1b/y5TJ/aNOGeouEanH6cvD6clOGi0F3VK5XnAzwijd49kXuDvQdO4ET4FrtVKc+DCq0yLe2Z3pZcX9q+HbmEFb+yQcE4BImSug9A== 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=blqG+niS56xZMMTHt0xG6xewmgIGfUKUASUYXo7zejk=; b=hXx2pLpg7m0wNzxWz1ULWVKS9w7V1wbw3+sY4rQfwylqlrvQAxZN10v7/YUqh6AzeDm9dnfkyJNijOOqY5y6EzSrvzRNX/oMBp6wX9kcQ9Stvbj/u4AUa+Bb9UsXSeQJlUP4mORqSUn0jTX+70hTYSQK8rBEgMkFnwtp85utswPX2uHE2O3hi8NVASQUqqwT5ZUjQBrO8I2V/pu2uGnvR8V0RZfEfybZIU460WMALQaj7zGZEkTRvplp32EXoZiy3Tw91rI12nxmk8A9i87tBKJB6tBretLTfTe7AARQOScs47s9VBCVLYknNw3pEgOvBLFIDVzWWhofeO1TXZIuUA== 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=blqG+niS56xZMMTHt0xG6xewmgIGfUKUASUYXo7zejk=; b=tRoR3o1lzrPVDFPVzUXnaNi4nbZ1X6HGr4zesok/YiFGndQ7PpBqooNanTw+Wy26+oBM7vUAsm580zPGAzmuMts+/pU4mC/p0vR9wBhTYXdwjYRuqFRbF3vJjqwdnki/gbs6bAx/BktNWQz6LlP1g8qe+99QgZy6+GDoVzJ2wXWrRH9DhAHAot0VV5XtTTfDD26CLAQbULJciCUdI2W04IookLNKVPUHyovSQjBKGCd75L78yi2HQpra7ftNum8V8XFn0/zha2JBQ3BqPu/a/e4n7ndkKomD+3zfA0SlsjOG6K8nZMGqqz/WIUmAV5laCqobJRtfUZKtbfCceKZxyw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS1PR01MB9370.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Sat, 13 Aug 2022 15:03:14 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.025; Sat, 13 Aug 2022 15:03:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Aug 2022 17:03:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5EB/O2v/W1RyuVo3O4bMW0+XHjGC/lEJ] X-ClientProxiedBy: AS9PR0301CA0034.eurprd03.prod.outlook.com (2603:10a6:20b:469::23) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220813150306.1116206-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 069edbab-23b8-424c-1d38-08da7d3cf203 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8mMamuGb261gBblBkR8QZSDWHDSZ/6CzEWHkco/YiBzwWIbYwRlIPs2exABmhikpk5oucf6bmgcS71D8iq23HnYZLTn4DldXWzCg8X6DCbui3P8NKqMnHHCCk/53CYqDHRYSk+nkB6i4SbluO67s1KoTdnkIgFK8+qTeoilqBDDf+ofooZPZPJJSUPwAfGnuXajzjeHm79J/e/OG2OIA5fj4KPkTV+gTxdIL51aJ3WK963zxeFVfq+UmK3nDrT5HKQembwbdGTZ26/xtpbXQE2tTjEclbGKrEpGWm7z2AHZiZgb+RXbt1fDaNj2DtI53PFuT8aQjsS01fFJ1OK0dQrUmzNvojskyqrKWnoZZVQTucSeQZmhcI+rfVi06joLTmWkZ0ebcDf1Y1fzTpGdnslmvUy4NNsritB8lBG0cuavrY5hgIcQ0XRE7WDfNtu0wiUelB0fcI5dTSMDbiV9XqZQ/jXBpMz2QQZ7VkIhPU5YtgAiwmZpbA6r0iEmnqEy5KemSxANgZoeANorgCD7AtlIcs1SEC/hVuIW7LtgYdt1ZDjzVfB8bFQ3DLM6+g6ZmOMdqnSQFdnGB7Q6EA+a8TMI5HFmrywUdMJQ8f59KsAhEUPN801cYH0bbK9mOgkIg/7TopxB4h0ScQVI8r/r9xHPEX4DMP1ebM9R+aM+nDmN9g== X-MS-TrafficTypeDiagnostic: AS1PR01MB9370:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: psWRaUxuTPVUWb0mZ36R19rj8Uzz0WBMASctwHAu4y6pHcZQuHga93dGIgJ7CoqicD7o7wuxCPv6aKHUCUtbpzbcz2AZse7IpCIq9Lu/BOYtarXsOOzm6f6DtD7Gi4i7F+M7WcxCfYmSE2Byz8nlLvHJohCBA8DbxANX6wlI311f22RlqnaJ6lycfFGOoxnIDWgzMGVQbGA2qbw39z63rNBM7zI4sGYgkWNkJ3Lg8d6mktA9iP7dC75g0LNKUAn3ckFtfUrYvzm6qHYhBMQqlVgNEGMD1kSM9PaVUKUJKY0IRNp+1yvXps6pynE2fsYmD/j9eCYA+VKSbGtv10rDAxry1H8nACOeX769h0jtSlnTZdYr8kIV+losX0WbqjaBh6u8+Nb7Jty1CUD60Dujok3/5BHVgf9cxDZnJuVF6ovP4zmRes4xTxlgg7LaYOp98vR0hO8Bj3LR2i7Kh088qreJcBx5n/U6fdlAKqf27ZewOZNG2l3WV3h8qtAXqqawUkCps2v1jmOTAdPhHrd8IDZG1BFGxJEzVeIE4phOqhnwBQ8+5EEDG9Tdv5I/q9D7yB7Zh8N1B+hfziS+K2HMmwhww4oRia5Nqr2xHDI/k1FA1mV+6QhmDcD8vfAZIT3tHsaPHek3DPc7LVh6iejXAg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p4/lVwUR+a+ghST3rPLcHQZvoKf5emXTo8OX/rkLJ96VM49SZcZ68SqpNYoE?= =?us-ascii?Q?n8M3FYQmx3Dp1+Ly5J1HrI+2OfKD4RR6YpCKSPdzfdU4ZWJ2XVOOYeC6yOSc?= =?us-ascii?Q?NZqtRNb3L4ZMyTqwjz8q1BUZbEg5CmA4aV/3Ot3ihxAkg6bQzAd04rM7i2r+?= =?us-ascii?Q?8QFInv608nPJov3D+IgEkmQwSkPEiXEQ0J33NXn5j8Lki5+leSEZxE7zI8yr?= =?us-ascii?Q?o2kHAz+DKG89wfbluyB6RWbtro+0F+nxTfhOwn+hS4YdPq7y/DyScfO6kKgr?= =?us-ascii?Q?2erfhpEjDETuLOc93/z0ChhtQy38VVT3XptGfADe+KQ1wEyvF5/l5m8k1QPu?= =?us-ascii?Q?PTHHnlJ+VOZuo2/Vx5w43twDpnLqoRt5AFeM0Rue8OFjWysckCaeo/Wexsqz?= =?us-ascii?Q?N9Km9Og5mscRGJoKol3hxNIZX/lPujFytw/qoQuLcoY5nnEEXk3J/lwy2Zfm?= =?us-ascii?Q?hfXu+kjhWwbARLw8JFlgSaotmAIRrkX6D8++0LynZ5p9O1SeSSUtD2mbnh7R?= =?us-ascii?Q?CdYVy2SZ0szC13HKub8RPBdrcbaceV+N7UvovckuR1hMhdxuolCvAyzxBYsg?= =?us-ascii?Q?kHJgcm8ZqDtCSQyoKFLdmnglLo14Ov3PJuby2tAIqTlBZQ5swB+2ttuMSQSj?= =?us-ascii?Q?krexSlwxrRQMbgw+od3WIU/WrFs9zaZz2lcKXljAy7Ds7Ug7Iimy6BryLMwJ?= =?us-ascii?Q?1MAE3JxKaP00cx1+oz6qct5qjvrhisXZyj2G3i+ywbmxTueTYTYbfwyDDcF3?= =?us-ascii?Q?c465VbSdsRU5eQghbZ+t4yX7uaK68gFqGraA1ynKq55wfrowo9ZrNuE0b+hp?= =?us-ascii?Q?dmmepBcL0jtTRT5Khf3oXVC0iPmNVFyfGhl9tK/GFxLB/AjnXeb2P+7Kr3od?= =?us-ascii?Q?R9EmC1hfYC6ZVKe3R0U0vWskp8dJWvbjAi6DRvSDcAwqViMOFm2fnYxAocQZ?= =?us-ascii?Q?H3DQNKuorQ8UjOF0PxRiuCl9Ropgg/1SE4qyJDMQ7L3DHMGd2zspk1CHd/Lk?= =?us-ascii?Q?NtCtDAMm3FTv5cVXFt0dT4T4VdOo/vN/1pLdj7bsWrOVzL3VpdPZIZwMsvWR?= =?us-ascii?Q?M8HuKNv57wlUH6r0I5nFT4ZlQpOhcGTgtARTeOve5rgqAHE0+jI29uLe5MDP?= =?us-ascii?Q?NsxLOmZVixTem1v/lKjsyAzPWc23nT130qOr+n9y/OkC54+F5N8qIqtcMELx?= =?us-ascii?Q?zZ/OGOR0xxMGGFOwGuVX9K+OanngVl/4jakOF+AlI4OJH1Erhmiq6P1gH8yp?= =?us-ascii?Q?yjXA944xkwDY2MdkaPisShoqi9DdOc3H7FXj0Me+N/mLxGUmnPNloETfX6OX?= =?us-ascii?Q?/Fg=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 069edbab-23b8-424c-1d38-08da7d3cf203 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2022 15:03:14.1115 (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: AS1PR01MB9370 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/avcodec: Remove redundant check 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: At this point active_thread_type is set iff active_thread_type is set to FF_THREAD_FRAME iff AVCodecInternal.frame_thread_encoder is set. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 0451f57f82..29643199be 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -283,8 +283,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ret < 0) goto free_and_end; - if (HAVE_THREADS - && !(avci->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { + if (HAVE_THREADS && !avci->frame_thread_encoder) { /* Frame-threaded decoders call FFCodec.init for their child contexts. */ lock_avcodec(codec2); ret = ff_thread_init(avctx); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".