From patchwork Sat Jul 9 19:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp393960pzb; Sat, 9 Jul 2022 12:14:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scIfAmmSlUnCVulQ5/iOo+GkjnGnq46twuuPe7nFtrhWzAzmB+IhYmI2GWR5kCCti3Extm X-Received: by 2002:aa7:de88:0:b0:435:9a54:168a with SMTP id j8-20020aa7de88000000b004359a54168amr13254884edv.73.1657394064431; Sat, 09 Jul 2022 12:14:24 -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 oy12-20020a170907104c00b006ff0fb360ffsi3184972ejb.10.2022.07.09.12.14.24; Sat, 09 Jul 2022 12:14:24 -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=KEkuSnvP; 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 7888F68B6B0; Sat, 9 Jul 2022 22:14:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2020.outbound.protection.outlook.com [40.92.58.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FD8F68B6B0 for ; Sat, 9 Jul 2022 22:14:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KYpy83Tbc2cle28JFtNfSrX1k3+25RMm7dVHAa+UDRB6dNqSe0KyHHGXyPOFnCHP5limUBy5Hfl/Hf+RJZmbwEnMCvrjNIYyCmqtvJutEOD4MwaqnqV4iqrQmXdG9lQudwMOpIFWPY9AIstnXAIQIkjtmCVQ5bO/eQjE6HnRujaMpsHx4+leqATl8SXK2eEGfY11i+Iih5Ij9UGabafQ1MjHoYiu00luCFdRX9QrdpM+IEw+vzqPVh6ZugeB+4CnNTVCbOzD2GJlH+lpL7iXFzKE5iPTdWBG6w0UI+GHjVz+idNI6TLSARuh44RcfSTVWUaTjpF898mI+l/4Jg1g3g== 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=cb/LEWmkXoECcAjSXzFnqgFwOxfMYLAp/r+2A0LvuzE=; b=NbOc7zI+bq1eaUPmUE6cEJJWPNg4pTat9WqtQ0TZiMkWUTs9vDM6/ICIyUf/Ft1jhlKHmhiPizBTJ5xwPAg8/D+IRyCGJzUKBIQ+sjndAfyoUH6iEh0B1th7FPwBr3co1c7Ybqe8IRUsvsftzA4AuFM+EuUSOuGkxfmk1+FD9eoqhoa1ibHrUXa5digXpFR6MDgQZVXW3P1CnYyRpixnV2HBZdB7YoZLM35bMY0ysyyr+qMuSEiS9kOvKyvl037NogDcm9YxClxHEgvSnL5+ezvUVvS1xocsqBVwO1oF46TZjFPTr1swpMvpcEH7c65uKT0Ttc+lkvx3FNgtDVrEtA== 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=cb/LEWmkXoECcAjSXzFnqgFwOxfMYLAp/r+2A0LvuzE=; b=KEkuSnvP4O1zl08o/P6TfcWQALJDtljSsiR9j6zjFdYSrDBBqgOaQCQSLdu8I7doXoPvAsbYjg3SbfMs8aw4viJ3H4BSN/U58D/kEwXcyvXFbI9wMlZdLvaWFhF2xN1tLWXlYP/xFQ6mY0bTeE8ms6wy5PqpRLB9+LePxES3++0bP5JWlKL0QRCidCDVThtTWRmx4J/QUsa/18oLlenq7/QWLPQvrP8EgabVJIohpkEdfOu+sD8LhnVEzpn3K9lzBFHnNCpp3KsRPQBD8kzE5zVHSSYoCSujCSW7A1F5hT0yLGEfNYYUaWuOlL5ocyJMClHLFc97bZ698d56x6K8gA== Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) by VI1PR01MB6269.eurprd01.prod.exchangelabs.com (2603:10a6:800:151::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Sat, 9 Jul 2022 19:14:12 +0000 Received: from HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::fd07:e0a1:9aee:cc8e]) by HE1PR0101MB2219.eurprd01.prod.exchangelabs.com ([fe80::fd07:e0a1:9aee:cc8e%4]) with mapi id 15.20.5417.020; Sat, 9 Jul 2022 19:14:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Jul 2022 21:14:04 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [9UDlghkLSTBkS2ltU95N5D8X3k+iLWes] X-ClientProxiedBy: FR3P281CA0073.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::17) To HE1PR0101MB2219.eurprd01.prod.exchangelabs.com (2603:10a6:3:2b::25) X-Microsoft-Original-Message-ID: <20220709191404.2028155-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88376a81-e78d-4f47-dfa2-08da61df34aa X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQAENbibdU0f9Z83D978ybSba85K8QXDW7y/UkxnG5U+zKc97XH7OvZZSq8f8SPlszQYbWLm64Gqo4kK3eI9SdcF8xTGbeQCnH4BJCZfQeGSCzTBvXesc91/EGpWWwIjDh6YKQXzQ0y4uKPrs7qj7BkD5cG9jLD0pyobH/jXRffNw4Bwnkj1AG5ecL78DKIIyO2Vhn0mSwULvthNFSQiAguCDC1iKlytksRyBMmS8Ka0dXTRYFyXm5JWICYjBuyrHi5Gi1TWVN9zfk1DTWeVmUZ9i1SfVF3BJ5QepAOviWCKa3Y2FT/u0jSDNIXs3G/w1QwCrb50MabLYK9YHOKKG0tlNc7dsM0qzRaR676cyndhiETYzChvhMveM4VyXYmfvKQ90tPViADS0WopfMy7sQvaCNqfnc09aWDEu1SVJDbD7DBOzyV9PwEmN0p8IYpc7s1l391wmDlFZROlWAIAxlhdJI4BRBOueFAgEnYwCt6IXzc7BG9ib1pOOrbHduMDZvXsTn2FmMWAGmmJ0V7s1Rrj9K8I01641KyvFFCETPwZYXngxhYiorqiatPlbKs6fnYCGckgxfSiO73NiDdN/XEsAsHXPynksBRTCo9nkGRJProZWcuNRREki6Xz5i/qjGvDfnCxOuq2mnOMNrSuHLzOavoL6oEkE5OtMw2wvIRooFbkHZHAZHZXQ9dLjrh2uQ4adl7iKYDoDad/t3QJPq/e2oN+Jz9F+/AcYkoOx1jROzbSUmhP09dtHoZGoDMO2M= X-MS-TrafficTypeDiagnostic: VI1PR01MB6269:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N09MJHAUwPRPPMp9PS/Wm57iOBjFmkkAD2Veg3QvNlg4T1qojsibLNf5lk5C6gwaqHnDh8q2YcWHAUhfJd35t0NCXAfgKW7kBT5dkAJMAAwXm9jwSZtGm85PLjtH5uHgrrRa0Omz7jv1hAzkfUG3vvtGhXgd8bfR7yRW2Rg0ZmrWZP7qZyyMp3LXE2p+YJYsOdhodoyCuYi0aUKUubUlSLpAEtDHDYeHGgjwVxjnLFldUE9qOpuUYx6PuwrItm6sbsdPqFOGihPU18ngydLF6Cvwspmrrp1vxuTViU6gYQVLczuZmszGXVOOTI2wGAtW2b+s+1EWQjRkNizYraTOI8qhVHKeUCqDRfYKLDRUV5fJXxHOa8Tbxe8HLfIAR9+/2lJkiMJD9i+h5qDOG7j9O3207NNT6TFjbhA4wgD271a05K/FTJEsTk5/eDver6DiBhBgloHNMlZ0puaOVfVXg2ARmlmCjv0oD7WZ+ur1tGpodMPWUeMQSwk0C/nVjkrI0oBLgMKNUdfkY5XY0jefwxBpAiVrG42jShE8rwSJrTtVFYWpRjJ1lXCgZBDyfvlctchmrv8yU5S/O3/m3rDYGqDYhMGM0jHr9MEwVSP22V2s1pykMsbm5f7sHA1QmBXVa57fusKgQNj3b0k+SqkwKl4gmz9+b/IUh0krHTs1+6YpbmhQCL325jtABIx4dqLvXjC86exk2ki5Q7EnHausng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fmprc8Z59ZKTEKXTFtRKtqWjL/tZDFnBfdvwoBZpqpMOTIPBuDNL0a8QQCaRANKRS3wPY7TOU7gt+8ViC21Xv614YlEUkwgLD7VThHIIyOjJEOK+HnFT//SrjgP/jnUxWoeg6kcdbFNrsubKjr3l0ggXM6orcHOgXmX0Vt/xu6qlVg4OuDwv79BdkEo/fFSwQ0iA3ldGsVkAs9+0unimdsbI529JxaVQICt3XfBaQPyuWA32uVTEdJlEk8k4+i22DECo8pRKfantwVVFPUauLFDJ8r08Ikd9Uvib351JseXSdx4rmlHILmaNZ3wapEWLgi9dDFl+ysiIaBl6fIelWJ90EcNx4MZMcOme0xnwE/c4dqlScImaJ5n3MQqB3+N45X41XGkDl2Fesm8l+uUVhpnQh+dDSOCg6L/mB5T+w45UuwjmHRdxhb5sF6VRSqZW2X51L+JdTs36SvBx3hSZj45yExILBh+kYJ/kroLnw+oITqwQWm875F2PpTy6r+40/VbHyvtqR/b8mO+dRB8aKft3SUmHgqtLMzWlUJMX2X46pVe/qcvBzh1LzoycdLsUBIBrQXtqjTUqb1L/39fssEhTmUNsjA/lQswshwFTo6rhy4wjcIGu9olTe+byJUx5PSrErAXZTQVLsP1tqO0l1Bon54bU89UCZPHk9cWPoC76bCI20SxAgt66RY/Qwbpdw4uqL/76lBHX9DqUxrVO00W7vERcH0okFLCu0CbaMizHHkYklBXRTUGyIW2+1QCXvkufQq/NVkdf7Z8hojJ81nEEerWYBxsQo/+InnrmQputQlul2Z//jvU9zRUr6DOntWUDdC3o4STbnk1aIwKJMAzpm6WPcFmuTDwlOeIRNC0L+QbZJrI9wQRaXZiJUSZR76Ds/MA0Y23IsTk5SoySmo8UCGbwXilOUSvA5nNi7t+5A+QDkmG68TyzzyQV5+UeoiPWYmDbbHZ8aGzj0A7J4TcE2gjSeN9jI5FF2Ab1wm6BnlYWjm46H2tDK8boKNnW03zK8XUq/clBV+37vINUCsjwzlYHX9ZS2noWq7TdQnFe09qkaNEsbqXSlAxRhZv1J6rxlkA8EHbu6F57ai86hH10ZGd3z1HxtFpP7Ob/wtxmp0WQV+nLGAqT37jyg8RB6kMaEzQZt04RZzWSiGUb/E927BYVsb+GD+ucyM3jXpktTd9BmmuWVSwqOlR+vyUHRYb5gUGXSq8UL9Ka+aN1yjrPtRdG2dZRbxR6S3wIYg0f8gjtIDWKSAJ8Nhcssscja5b2Kul1RefSZsvWAWwqcADG51JmkfkfQnvwwmGN1xA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88376a81-e78d-4f47-dfa2-08da61df34aa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0101MB2219.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2022 19:14:12.0561 (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: VI1PR01MB6269 Subject: [FFmpeg-devel] [PATCH] avcodec/pnmdec: Mark PHM decoder as init-threadsafe 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: lYdud7FpeDC2 Signed-off-by: Andreas Rheinhardt --- libavcodec/pnmdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index bb2ce53496..f012ed288b 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -513,5 +513,6 @@ const FFCodec ff_phm_decoder = { .priv_data_size = sizeof(PNMContext), .init = phm_dec_init, FF_CODEC_DECODE_CB(pnm_decode_frame), + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif From patchwork Sat Jul 9 23:10:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36721 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp477408pzb; Sat, 9 Jul 2022 16:10:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1srMqdz511G7INhh3RJfwePKzb3lCuekvi1iEI0VMDgv+7yRJl5qq3whKCthvlCd4eQunby X-Received: by 2002:a05:6402:4252:b0:43a:9232:dafc with SMTP id g18-20020a056402425200b0043a9232dafcmr14356726edb.243.1657408245459; Sat, 09 Jul 2022 16:10:45 -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 sc21-20020a1709078a1500b0072a4d67ee90si4887142ejc.557.2022.07.09.16.10.44; Sat, 09 Jul 2022 16:10:45 -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=cVyhSwVp; 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 C3E9468B3FD; Sun, 10 Jul 2022 02:10:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072056.outbound.protection.outlook.com [40.92.72.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E31568B840 for ; Sun, 10 Jul 2022 02:10:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJVcrWje6IfCf5BF4lGNdVZXm9VUqT9ZDK62x0FQyrMgeNNpaOMPspgj/5h/xLR0LdAAps2ZEvVDp0AT5gVgEunev+oUt79VSB4PYWJ3Ne1QeHjzf2Xfp3ket/gG7lcXxi9+GnKe2hM+vVt3CeN+7+ORThrCYKr/dg6fJdNxMFLaCKI8mjz1vWOPyMwbOUCJPhmDbkEn29w/GAtQnsoPXc89hnFHfzYpWof0vReAke8Pzqtnmzjtx7ce4IO4IGBMXanbrHQmC0SZ/7n3qBSyEu8g85aLUv6TufAAfRDdupk7wbuidXKm4HU1yhNuDXyXYQUsBSG6jJ5C5lPBMYKWCQ== 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=yXACoMAd6iYPVQLo+ZpBYmCF5OT3l66lWCw2eakuCfQ=; b=EQowtOcvaHqa2lwgBskl08qULcLn3YLoD+/q07jKJNDsDVzeyKkK+s6J7HlGJUCXhZgR82gTjEGmi9W8fkeLPT3GMEOwoSz18nn+tvZkn4sswaWJOY1itLXfwGWVzIC1GsVwDUUNsBBchwo1GDFXKUGGPmDpGFgSy6DSjb6Y5o9k+WMmtDFVMpKP3CuVT8JR+TYXJxDZ2bK8cLoft4d3Tw1tbWghAWSeDq18yLI6WxfNytN/Uu71HmFmU7DTGapXJfe79ZQPVPzzE4db485mRqDkQIO8QTqUR0L/34CWfAeixaZ9DFz53FCJloaCxAV9U7QjR3bkXj+ELeSic0+2zQ== 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=yXACoMAd6iYPVQLo+ZpBYmCF5OT3l66lWCw2eakuCfQ=; b=cVyhSwVp+8Vz3UIqOY61mXyH0ThmHePJLe3RvNZ9V8cRIG+PeGZtV+7C29uk4zlu6oJGDsPrlu3Tio26fqIqt/d6KatoiDvsdQ3OU4Pf0maL3rioCAb+aUQHnw+hj58kNrbMA57cGgkIeuZKtECMv+Vq9nL67/oMzvRRhyzmB6uOUGTNsxLjVUC2PDvaZ6pCyVd6+prEoPw76k5sZunt3S4fHBsUGyBsyBse6XkMJEv7Rr8ZwODK4Uox/Ujwaurw71gWT+VmFQL73Mp7PrvJ29eh6cUNy+tMkjCj1obymiFKzxmYOKdyTN5TwKLY243gM8FyBGgN5ifEzEyYYVXWEQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7753.eurprd01.prod.exchangelabs.com (2603:10a6:10:1e5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Sat, 9 Jul 2022 23:10:29 +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.5417.025; Sat, 9 Jul 2022 23:10:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jul 2022 01:10:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [USPKnV2NGGsrg1n1Vo9C4imD/xzfiPB5] X-ClientProxiedBy: FR0P281CA0130.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220709231021.2338914-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c46b33b5-470a-4786-0dd6-08da62003745 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsvoOnQns0vxmpFm8LQGDyUgewAvKByExtjVuy3ezrcQwd69HTH4TiSsdR5UYXRWeO6taRUJHdAjbhQ6CzOLNNnXjVXS6Jh8lWDIsutHxrUno8kCJy8y4SPi9Fbg4l+EWa8DOHHTI/pmXKp4tRB/Cxx8pLPHRW2YX+fmIdtZJKBSI26ELaC/A17NulhtxBoQ/0/6Wfhs+47tKeVxbgaWwi8GDoLIzsw5ALRIzNs+V9a6SWekRRoXksN2nwkevxKo5Mar6cjzBrXrBhRXdzCRopyI/Fa5ePuluQYieNhRmMI5ngnhuCCKRrbbUpGxR33g+XaPA1OmvhqonhQ57J4zjFNnVMQaQx3L0YJl291EnsPGRmHN0SBdVdUbH0tf2qld5qFIBhDzheqUXPOOvQRbzpIgonR4eyzKKr9C809hoLBCPvXauKsG7tXkoUAMVrX7D41Qt3xmscFckGFRmdV/pG9KaBb8H/dd3Uuvhp7xAJOkIXwa61wQmcifgHyIqqGRARJE8JL21lNbJisiJxGnEDlRkdY7DTAd9hMit+BHvteWFT3Yogo+qLr7WZvhKuntd4LVlFrEN2q8vyqpAKMCX+3Nb0EkXTzh/CY5B1EB0xHpWlx02aNqeH32bRG2zlAx1nMh+7fmPYfUqodrSrZVtYLhMsbTuUJiqUjx8Nwdopg0RA3JL4p0vhOrWCdbUd9C8joDtDhP8ydmRQ2/83Z1kUSVnjFvPp0NB0wrayYKwyzH1HeofTxkXrm3rnt634xGj2YoHjSAEXWywNjkc+kuCbB X-MS-TrafficTypeDiagnostic: DBBPR01MB7753:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eyqHKhUIh5GeaGbmrToCiUpC+UUtEKWFWsjp2QdCnHkIRsk6OSYJmezdXwn2xH+jvWIabqmbIY/95HZpWNn24NLPtLkadlyl5DoJL02ldOyFfKUeMy23NoWTip1b8yeOf8tFM8RvxhEtBA4tJtWeNUqFUxEUZdtNoldcGux5Q5NYiZDPSRHF6bC55kOW1ITe2lfZWzl7HyShIAlSXLbukblZWQB9SX9CYxqh4vtOG0OW4pUh0PZDmLEo6Y8oM5DyCl2BwYYyA/SFS0DbuMuiWndPuFGk3saKAXbRPaDVki8cGowB4kEbeErgdq2JJa3wevDKaQpdjgUVWOR2JxHbmIlvG2oHbGyfCSvbWretR/CY7C4RWhrTRH4NBZQBBPRA1Aee+tzMJnYyzrc+prjnio8biOKQgSjLe9puTB8bYbHdETM7hzUMnExbOJXDoHErudQE7Y4+RiXTdNZmtEX65Q7Lzc/VykT5LSFDV8xf1o0xXrba2iFjVss3Qwp6gCgqo6pCIFIWRmSKTuq6BbtLDfl+gjuow+lpl6ri+Vpj9lv9GtImUnlmCcs6zA+xnrpjAm4DqCxFyscpMGS4Okpjk5VXipYEK69GHpguOWxJEcC+l6wRvlBZlt1G6r4Qb936LbcKb/10p9fVHgl0ycybWH69PvwagWh8hIAjfytMBLyaCGr24btA6b7kYG4stR/9nx5h4vT3ODdogYTtO3Q0tQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: elbhVABjIbs4Dav+g4cR5dNAt+UZVHQ/2OSF7wqXWLBqLeat1r163LwMuoYwTXTnYc8pKCEpivNxn/jwX13RaREmn7a0LarGy9nddUyG/51nJawlNrCY3N53MpcCN/+v0Nf3i5AUQKQSjDrWygsqU01CH0fVMoH7KmQCVAt/NBlffjaOYcwZEQ3vTaR65ImESjqXs6sPc7GBhKRfWLN2uhgGTOqDFuwaXwYbkueF3lLCv2CcyfRIRw7en/DAHPZnS5wBJobkYcBWqylwu/Ko5B6Sc80iAW7rxmxds4YP2kvhRwtismrvEW79Ij3TX8QijiZIWvVwDa5gFuCwriJJVKWNTXCpqQQNS3Cz273G1DX2UY3xe0/eOc2vvM3VxY7Cb1J1EXSN42Jl1yymxd5083+Tk689LLEEBjQ97JEKvx7MMFcgGGZGoVkuylm7jMEy2km4rt1IQ9KaSRo5nAIZG/ZkWzST3hQi+Y7+M+s9agXa8kHmfMInkGTdwUtBMBqYCCQddzd7oERgHwsoxn0uPLDy/eO6jKozId2o6Cu105k7Q/BNfZkU945TAY0M0w8ivpXLyCRqJe8WTUFXju7f5lfpOSiCkfwdfgs8Y5swLzOlMI7quvANPaMt/h79FXZGHcxAH95GT+06dkTiOxByqAZPq5PqHZabJyXbL8s5dt7gasMLDfvzmI0mVKkgW81OF+HU4mgOkrX+1bVjgSbAiXCmVe/BsK869U8bNYnR0+qr51dKV2ojsIcO0pdSZusdkPS2LSJ54xFtuUaUHwakzAuZvKVAnAu/7TbX7HnYv8DWqSYt8zefOYYe6Tj6irepv9H7ItARy5i+PcBmYitIUTeXyJY4JsJwmEDBDBqFkZ5TinHOnfMT7d4H3EnRMoy0hMOjAN1wliOSQmSPFHhKVEAvxsIJVE2Zci/jZTYpu3kDGT4P3EfW0lO/PDwMp7zguCu5V4oDGLYIB/sh8j9+KStVjygwszFaUMThJEEnM011KBG/GEgmPV6quUp+1RRtcEBxUlINnDJZNi424K6hOVwmNmM95s2I/VdKdHz67ojmkmkrbvLXxwBcirlZzoO4Hy+x7bKuU/Y71B6i3e51qVRwnpS7VxX0PGsDhqLF2U93mbao3jDGs5mV5+z7fzAi3SRQlarLQo9mahqILURf5MH7rOB1Utp4f/HLInAH6lQHewNVzFM3tcYx33fBv0ra+Bm2mt2Pwkylz2UPup86kvipsI1jc8gdeAyPl5vxZPqMtErZcd3wXL6nEw5Meh0Y9hZ8HB4A8r5dlEe+SzEwHScz+S39OLKGHlO7CCUbP7I= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c46b33b5-470a-4786-0dd6-08da62003745 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2022 23:10:29.8140 (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: DBBPR01MB7753 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec: Add FF_CODEC_CAP_NOT_INIT_THREADSAFE 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: HIVBQ21a6wxB This is in preparation of switching the default init-thread-safety to a codec being init-thread-safe. Signed-off-by: Andreas Rheinhardt --- libavcodec/amfenc_h264.c | 3 ++- libavcodec/amfenc_hevc.c | 3 ++- libavcodec/codec_internal.h | 7 +++++++ libavcodec/crystalhd.c | 3 ++- libavcodec/cuviddec.c | 3 ++- libavcodec/libaomdec.c | 3 ++- libavcodec/libaomenc.c | 3 ++- libavcodec/libaribb24.c | 1 + libavcodec/libcelt_dec.c | 1 + libavcodec/libcodec2.c | 2 ++ libavcodec/libdavs2.c | 3 ++- libavcodec/libfdk-aacenc.c | 1 + libavcodec/libgsmdec.c | 2 ++ libavcodec/libgsmenc.c | 2 ++ libavcodec/libilbc.c | 2 ++ libavcodec/libjxldec.c | 3 ++- libavcodec/libjxlenc.c | 3 ++- libavcodec/libmp3lame.c | 1 + libavcodec/libopencore-amr.c | 3 +++ libavcodec/libopenjpegdec.c | 1 + libavcodec/libopenjpegenc.c | 1 + libavcodec/libopusdec.c | 3 ++- libavcodec/libopusenc.c | 1 + libavcodec/librav1e.c | 3 ++- libavcodec/libshine.c | 1 + libavcodec/libspeexdec.c | 1 + libavcodec/libspeexenc.c | 1 + libavcodec/libsvtav1.c | 3 ++- libavcodec/libtheoraenc.c | 1 + libavcodec/libtwolame.c | 1 + libavcodec/libuavs3d.c | 3 ++- libavcodec/libvo-amrwbenc.c | 1 + libavcodec/libvorbisdec.c | 1 + libavcodec/libvorbisenc.c | 1 + libavcodec/libvpxdec.c | 6 ++++-- libavcodec/libvpxenc.c | 6 ++++-- libavcodec/libwebpenc.c | 1 + libavcodec/libwebpenc_animencoder.c | 1 + libavcodec/libx264.c | 7 ++++++- libavcodec/libx265.c | 3 ++- libavcodec/libxavs.c | 3 ++- libavcodec/libxavs2.c | 3 ++- libavcodec/libzvbi-teletextdec.c | 1 + libavcodec/mediacodecdec.c | 3 ++- libavcodec/mmaldec.c | 3 ++- libavcodec/nvenc_h264.c | 3 ++- libavcodec/nvenc_hevc.c | 3 ++- libavcodec/qsvdec.c | 1 + libavcodec/qsvenc_h264.c | 3 ++- libavcodec/qsvenc_hevc.c | 3 ++- libavcodec/qsvenc_jpeg.c | 1 + libavcodec/qsvenc_mpeg2.c | 3 ++- libavcodec/qsvenc_vp9.c | 3 ++- libavcodec/rkmppdec.c | 1 + libavcodec/v4l2_m2m_dec.c | 3 ++- libavcodec/v4l2_m2m_enc.c | 3 ++- libavcodec/vaapi_encode_h264.c | 3 ++- libavcodec/vaapi_encode_h265.c | 3 ++- libavcodec/vaapi_encode_mjpeg.c | 3 ++- libavcodec/vaapi_encode_mpeg2.c | 3 ++- libavcodec/vaapi_encode_vp8.c | 3 ++- libavcodec/vaapi_encode_vp9.c | 3 ++- 62 files changed, 117 insertions(+), 37 deletions(-) diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index efb04589f6..eba8c23cdd 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -391,7 +391,8 @@ const FFCodec ff_h264_amf_encoder = { .defaults = defaults, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = ff_amf_pix_fmts, .p.wrapper_name = "amf", .hw_configs = ff_amfenc_hw_configs, diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 8ab9330730..5aaaa83e39 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -323,7 +323,8 @@ const FFCodec ff_hevc_amf_encoder = { .defaults = defaults, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = ff_amf_pix_fmts, .p.wrapper_name = "amf", .hw_configs = ff_amfenc_hw_configs, diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index 5df286ce52..a90c19d61a 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -29,6 +29,13 @@ * allowing to call the init function without locking any global mutexes. */ #define FF_CODEC_CAP_INIT_THREADSAFE (1 << 0) +/** + * The codec is not known to be init-threadsafe (i.e. it might be unsafe + * to initialize this codec and another codec concurrently, typically because + * the codec calls external APIs that are not known to be thread-safe). + * Therefore calling the codec's init function needs to be guarded with a lock. + */ +#define FF_CODEC_CAP_NOT_INIT_THREADSAFE (1 << 9) /** * The codec allows calling the close function for deallocation even if * the init function returned a failure. Without this capability flag, a diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index cf74f22e7d..555b1d2b6b 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -787,7 +787,8 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame) .flush = flush, \ .bsfs = bsf_name, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ - .caps_internal = FF_CODEC_CAP_SETS_FRAME_PROPS, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_SETS_FRAME_PROPS, \ .p.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, \ .p.wrapper_name = "crystalhd", \ }; diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index b544b3361d..7dbd4c9ec1 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -1129,7 +1129,8 @@ static const AVCodecHWConfigInternal *const cuvid_hw_configs[] = { .flush = cuvid_flush, \ .bsfs = bsf_name, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ - .caps_internal = FF_CODEC_CAP_SETS_FRAME_PROPS, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_SETS_FRAME_PROPS, \ .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_CUDA, \ AV_PIX_FMT_NV12, \ AV_PIX_FMT_P010, \ diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 52a8bf19e2..3243610304 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -258,7 +258,8 @@ const FFCodec ff_libaom_av1_decoder = { .close = aom_free, FF_CODEC_DECODE_CB(aom_decode), .p.capabilities = AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), .p.wrapper_name = "libaom", }; diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 6b7e426bfd..b792226744 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1442,7 +1442,8 @@ FFCodec ff_libaom_av1_encoder = { .init = av1_init, FF_CODEC_ENCODE_CB(aom_encode), .close = aom_free, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .defaults = defaults, .init_static_data = av1_init_static, }; diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 9658e1d5ac..e89e49a771 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -388,6 +388,7 @@ const FFCodec ff_libaribb24_decoder = { .p.id = AV_CODEC_ID_ARIB_CAPTION, .p.priv_class = &aribb24_class, .p.wrapper_name = "libaribb24", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(Libaribb24Context), .init = libaribb24_init, .close = libaribb24_close, diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index d659d80ed2..a9c9962b71 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -134,6 +134,7 @@ const FFCodec ff_libcelt_decoder = { .p.id = AV_CODEC_ID_CELT, .p.capabilities = AV_CODEC_CAP_DR1, .p.wrapper_name = "libcelt", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(struct libcelt_context), .init = libcelt_dec_init, .close = libcelt_dec_close, diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index abb1130e80..0f2e671ab1 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -185,6 +185,7 @@ const FFCodec ff_libcodec2_decoder = { .p.supported_samplerates = (const int[]){ 8000, 0 }, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibCodec2Context), .init = libcodec2_init_decoder, .close = libcodec2_close, @@ -204,6 +205,7 @@ const FFCodec ff_libcodec2_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, { 0 } }, .p.priv_class = &libcodec2_enc_class, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibCodec2Context), .init = libcodec2_init_encoder, .close = libcodec2_close, diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 918e48502c..ce4c6a34f0 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -232,7 +232,8 @@ const FFCodec ff_libdavs2_decoder = { FF_CODEC_DECODE_CB(davs2_decode_frame), .flush = davs2_flush, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.wrapper_name = "libdavs2", diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index a5697bde51..2ffbc180ba 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -480,6 +480,7 @@ const FFCodec ff_libfdk_aac_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AAC, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AACContext), .init = aac_encode_init, FF_CODEC_ENCODE_CB(aac_encode_frame), diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c index 9c2304f7a2..6e37122261 100644 --- a/libavcodec/libgsmdec.c +++ b/libavcodec/libgsmdec.c @@ -132,6 +132,7 @@ const FFCodec ff_libgsm_decoder = { .p.id = AV_CODEC_ID_GSM, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.wrapper_name = "libgsm", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibGSMDecodeContext), .init = libgsm_decode_init, .close = libgsm_decode_close, @@ -147,6 +148,7 @@ const FFCodec ff_libgsm_ms_decoder = { .p.id = AV_CODEC_ID_GSM_MS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.wrapper_name = "libgsm", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibGSMDecodeContext), .init = libgsm_decode_init, .close = libgsm_decode_close, diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index a45b77be95..f83389dd60 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -134,6 +134,7 @@ const FFCodec ff_libgsm_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.wrapper_name = "libgsm", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, }; #endif #if CONFIG_LIBGSM_MS_ENCODER @@ -154,5 +155,6 @@ const FFCodec ff_libgsm_ms_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.wrapper_name = "libgsm", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c index a7b1eaf28c..0b6b1fbb24 100644 --- a/libavcodec/libilbc.c +++ b/libavcodec/libilbc.c @@ -122,6 +122,7 @@ const FFCodec ff_libilbc_decoder = { .p.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ILBC, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(ILBCDecContext), .init = ilbc_decode_init, FF_CODEC_DECODE_CB(ilbc_decode_frame), @@ -204,6 +205,7 @@ const FFCodec ff_libilbc_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ILBC, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(ILBCEncContext), .init = ilbc_encode_init, FF_CODEC_ENCODE_CB(ilbc_encode_frame), diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index 829478bbde..b9322b082a 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -455,6 +455,7 @@ const FFCodec ff_libjxl_decoder = { FF_CODEC_DECODE_CB(libjxl_decode_frame), .close = libjxl_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "libjxl", }; diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 6a948cc3ae..1119188adf 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -463,7 +463,8 @@ const FFCodec ff_libjxl_encoder = { FF_CODEC_ENCODE_CB(libjxl_encode_frame), .close = libjxl_encode_close, .p.capabilities = AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 02a256c766..2cd51692a2 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -335,6 +335,7 @@ const FFCodec ff_libmp3lame_encoder = { .p.id = AV_CODEC_ID_MP3, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LAMEContext), .init = mp3lame_encode_init, FF_CODEC_ENCODE_CB(mp3lame_encode_frame), diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 539f0ded3c..014dd53fa5 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -138,6 +138,7 @@ const FFCodec ff_libopencore_amrnb_decoder = { .p.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_NB, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AMRContext), .init = amr_nb_decode_init, .close = amr_nb_decode_close, @@ -293,6 +294,7 @@ const FFCodec ff_libopencore_amrnb_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_AMR_NB, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AMRContext), .init = amr_nb_encode_init, FF_CODEC_ENCODE_CB(amr_nb_encode_frame), @@ -379,6 +381,7 @@ const FFCodec ff_libopencore_amrwb_decoder = { .p.id = AV_CODEC_ID_AMR_WB, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.wrapper_name = "libopencore_amrwb", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AMRWBContext), .init = amr_wb_decode_init, .close = amr_wb_decode_close, diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 58ac6c413a..fa420f145b 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -509,6 +509,7 @@ const FFCodec ff_libopenjpeg_decoder = { .p.max_lowres = 31, .p.priv_class = &openjpeg_class, .p.wrapper_name = "libopenjpeg", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibOpenJPEGContext), .init = libopenjpeg_decode_init, FF_CODEC_DECODE_CB(libopenjpeg_decode_frame), diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 06338e882c..750fce3d8d 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -759,6 +759,7 @@ const FFCodec ff_libopenjpeg_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibOpenJPEGContext), .init = libopenjpeg_encode_init, FF_CODEC_ENCODE_CB(libopenjpeg_encode_frame), diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 316ab0f2a7..7b7d9c8a84 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -241,7 +241,8 @@ const FFCodec ff_libopus_decoder = { FF_CODEC_DECODE_CB(libopus_decode), .flush = libopus_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index c884075ffe..48dd32fc38 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -588,6 +588,7 @@ const FFCodec ff_libopus_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_OPUS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibopusEncContext), .init = libopus_encode_init, FF_CODEC_ENCODE_CB(libopus_encode), diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 9d811ba81c..67b301b802 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -628,6 +628,7 @@ const FFCodec ff_librav1e_encoder = { .p.pix_fmts = librav1e_pix_fmts, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .p.wrapper_name = "librav1e", }; diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 9bc545689a..123b1a0847 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -137,6 +137,7 @@ const FFCodec ff_libshine_encoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP3, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(SHINEContext), .init = libshine_encode_init, FF_CODEC_ENCODE_CB(libshine_encode_frame), diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index 8c9e05e51d..daa6dec64a 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -197,6 +197,7 @@ const FFCodec ff_libspeex_decoder = { .p.id = AV_CODEC_ID_SPEEX, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.wrapper_name = "libspeex", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibSpeexContext), .init = libspeex_decode_init, .close = libspeex_decode_close, diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index ec4b3c6a8f..9eab8f8af0 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -353,6 +353,7 @@ const FFCodec ff_libspeex_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_SPEEX, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibSpeexEncContext), .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index d9ebb6aa56..234c24ca7a 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -666,7 +666,8 @@ const FFCodec ff_libsvtav1_encoder = { FF_CODEC_RECEIVE_PACKET_CB(eb_receive_packet), .close = eb_enc_close, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_NONE }, diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 162d170b0f..22835553d6 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -374,6 +374,7 @@ const FFCodec ff_libtheora_encoder = { .p.id = AV_CODEC_ID_THEORA, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY /* for statsfile summary */, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(TheoraContext), .init = encode_init, .close = encode_close, diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index 1e53cf2257..98df38d013 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -214,6 +214,7 @@ const FFCodec ff_libtwolame_encoder = { .p.long_name = NULL_IF_CONFIG_SMALL("libtwolame MP2 (MPEG audio layer 2)"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_MP2, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(TWOLAMEContext), .init = twolame_encode_init, FF_CODEC_ENCODE_CB(twolame_encode_frame), diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index 7c6c3f0440..5ccd9893a5 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -256,7 +256,8 @@ const FFCodec ff_libuavs3d_decoder = { .close = libuavs3d_end, FF_CODEC_DECODE_CB(libuavs3d_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .flush = libuavs3d_flush, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P10LE, diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index 12ef6d7fe6..e58c980b5c 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -148,6 +148,7 @@ const FFCodec ff_libvo_amrwbenc_encoder = { .p.id = AV_CODEC_ID_AMR_WB, .p.priv_class = &amrwb_class, .p.wrapper_name = "libvo_amrwbenc", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(AMRWBContext), .init = amr_wb_encode_init, FF_CODEC_ENCODE_CB(amr_wb_encode_frame), diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index 81c4ac1c02..38a8314760 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -216,6 +216,7 @@ const FFCodec ff_libvorbis_decoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_VORBIS, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(OggVorbisDecContext), .init = oggvorbis_decode_init, FF_CODEC_DECODE_CB(oggvorbis_decode_frame), diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index 9460d3267c..3353776083 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -382,6 +382,7 @@ const FFCodec ff_libvorbis_encoder = { .p.id = AV_CODEC_ID_VORBIS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SMALL_LAST_FRAME, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibvorbisEncContext), .init = libvorbis_encode_init, FF_CODEC_ENCODE_CB(libvorbis_encode_frame), diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 0b279e7eda..c5b95332d3 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -366,7 +366,8 @@ const FFCodec ff_libvpx_vp8_decoder = { .init = vp8_init, .close = vpx_free, FF_CODEC_DECODE_CB(vpx_decode), - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, }; #endif /* CONFIG_LIBVPX_VP8_DECODER */ @@ -389,7 +390,8 @@ FFCodec ff_libvpx_vp9_decoder = { .init = vp9_init, .close = vpx_free, FF_CODEC_DECODE_CB(vpx_decode), - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .init_static_data = ff_vp9_init_static, }; #endif /* CONFIG_LIBVPX_VP9_DECODER */ diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 187a9e9a36..5b7c7735a1 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1951,7 +1951,8 @@ const FFCodec ff_libvpx_vp8_encoder = { .init = vp8_init, FF_CODEC_ENCODE_CB(vpx_encode), .close = vpx_free, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_NONE }, .p.priv_class = &class_vp8, .defaults = defaults, @@ -1986,7 +1987,8 @@ FFCodec ff_libvpx_vp9_encoder = { .init = vp9_init, FF_CODEC_ENCODE_CB(vpx_encode), .close = vpx_free, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .defaults = defaults, .init_static_data = ff_vp9_init_static, }; diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c index c5dc1b160a..be7bfa3963 100644 --- a/libavcodec/libwebpenc.c +++ b/libavcodec/libwebpenc.c @@ -96,6 +96,7 @@ const FFCodec ff_libwebp_encoder = { .p.pix_fmts = ff_libwebpenc_pix_fmts, .p.priv_class = &ff_libwebpenc_class, .p.wrapper_name = "libwebp", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibWebPContext), .defaults = ff_libwebp_defaults, .init = libwebp_encode_init, diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 765fcf70d2..43116c63c0 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -138,6 +138,7 @@ const FFCodec ff_libwebp_anim_encoder = { .p.pix_fmts = ff_libwebpenc_pix_fmts, .p.priv_class = &ff_libwebpenc_class, .p.wrapper_name = "libwebp", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(LibWebPAnimContext), .defaults = ff_libwebp_defaults, .init = libwebp_anim_encode_init, diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 98ec030865..17fd7ae3e1 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1239,6 +1239,8 @@ FFCodec ff_libx264_encoder = { .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS #if X264_BUILD >= 158 | FF_CODEC_CAP_INIT_THREADSAFE +#else + | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , }; @@ -1271,6 +1273,8 @@ const FFCodec ff_libx264rgb_encoder = { .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS #if X264_BUILD >= 158 | FF_CODEC_CAP_INIT_THREADSAFE +#else + | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , }; @@ -1300,6 +1304,7 @@ const FFCodec ff_libx262_encoder = { FF_CODEC_ENCODE_CB(X264_frame), .close = X264_close, .defaults = x264_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, }; #endif diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index f68ecb3092..6d2590dd7f 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -757,5 +757,6 @@ FFCodec ff_libx265_encoder = { .close = libx265_encode_close, .priv_data_size = sizeof(libx265Context), .defaults = x265_defaults, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, }; diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index a3efbcb4a1..2c7577535f 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -432,7 +432,8 @@ const FFCodec ff_libxavs_encoder = { .init = XAVS_init, FF_CODEC_ENCODE_CB(XAVS_frame), .close = XAVS_close, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &xavs_class, .defaults = xavs_defaults, diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index bf34b7acbb..d4a1bf5bfc 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -297,7 +297,8 @@ const FFCodec ff_libxavs2_encoder = { .init = xavs2_init, FF_CODEC_ENCODE_CB(xavs2_encode_frame), .close = xavs2_close, - .caps_internal = FF_CODEC_CAP_AUTO_THREADS, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_AUTO_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &libxavs2, diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 514e76f1b6..c88ede05b5 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -819,6 +819,7 @@ const FFCodec ff_libzvbi_teletext_decoder = { .p.capabilities = AV_CODEC_CAP_DELAY, .p.priv_class = &teletext_class, .p.wrapper_name = "libzvbi", + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(TeletextContext), .init = teletext_init_decoder, .close = teletext_close_decoder, diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 6b4c39b4e0..0bf2a0595d 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -544,7 +544,8 @@ const FFCodec ff_ ## short_name ## _mediacodec_decoder = { .flush = mediacodec_decode_flush, \ .close = mediacodec_decode_close, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_SETS_PKT_DTS, \ .bsfs = bsf, \ .hw_configs = mediacodec_hw_configs, \ .p.wrapper_name = "mediacodec", \ diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 7fd24ad3b7..c9b7b16b69 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -841,7 +841,8 @@ static const AVClass ffmmal_dec_class = { .flush = ffmmal_flush, \ .p.priv_class = &ffmmal_dec_class, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, \ - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_SETS_PKT_DTS, \ .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MMAL, \ AV_PIX_FMT_YUV420P, \ AV_PIX_FMT_NONE}, \ diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 1860c60a29..7fa6c23190 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -233,7 +233,8 @@ const FFCodec ff_h264_nvenc_encoder = { .defaults = defaults, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = ff_nvenc_pix_fmts, .p.wrapper_name = "nvenc", .hw_configs = ff_nvenc_hw_configs, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 2c64cce598..290bb1eb77 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -215,7 +215,8 @@ const FFCodec ff_hevc_nvenc_encoder = { .p.pix_fmts = ff_nvenc_pix_fmts, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "nvenc", .hw_configs = ff_nvenc_hw_configs, }; diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 5fc5bed4c8..d8283b9207 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -1025,6 +1025,7 @@ const FFCodec ff_##x##_qsv_decoder = { \ AV_PIX_FMT_NONE }, \ .hw_configs = qsv_hw_configs, \ .p.wrapper_name = "qsv", \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \ }; \ #define DEFINE_QSV_DECODER(x, X, bsf_name) DEFINE_QSV_DECODER_WITH_OPTION(x, X, bsf_name, options) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 87b09360cb..7756dc1789 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -200,7 +200,8 @@ const FFCodec ff_h264_qsv_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &class, .defaults = qsv_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "qsv", .hw_configs = ff_qsv_enc_hw_configs, }; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index f6027f600b..b09640365c 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -315,7 +315,8 @@ const FFCodec ff_hevc_qsv_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &class, .defaults = qsv_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "qsv", .hw_configs = ff_qsv_enc_hw_configs, }; diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c index 825eb8dc06..c5b6a406a5 100644 --- a/libavcodec/qsvenc_jpeg.c +++ b/libavcodec/qsvenc_jpeg.c @@ -96,4 +96,5 @@ const FFCodec ff_mjpeg_qsv_encoder = { .defaults = qsv_enc_defaults, .p.wrapper_name = "qsv", .hw_configs = ff_qsv_enc_hw_configs, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, }; diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 5cb12a2582..7340ece9a9 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -108,7 +108,8 @@ const FFCodec ff_mpeg2_qsv_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &class, .defaults = qsv_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "qsv", .hw_configs = ff_qsv_enc_hw_configs, }; diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c index 4b2a6ce77f..3662df1823 100644 --- a/libavcodec/qsvenc_vp9.c +++ b/libavcodec/qsvenc_vp9.c @@ -118,7 +118,8 @@ const FFCodec ff_vp9_qsv_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &class, .defaults = qsv_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "qsv", .hw_configs = ff_qsv_enc_hw_configs, }; diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index d4f09f456d..77d09739a5 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -578,6 +578,7 @@ static const AVCodecHWConfigInternal *const rkmpp_hw_configs[] = { .hw_configs = rkmpp_hw_configs, \ .bsfs = BSFS, \ .p.wrapper_name = "rkmpp", \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \ }; RKMPP_DEC(h264, AV_CODEC_ID_H264, "h264_mp4toannexb") diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 8a51dec3fa..81729e256c 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -252,7 +252,8 @@ static const AVOption options[] = { .close = v4l2_decode_close, \ .bsfs = bsf_name, \ .p.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, \ - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP, \ .p.wrapper_name = "v4l2m2m", \ } diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 20f81df750..03425673ea 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -433,7 +433,8 @@ static const FFCodecDefault v4l2_m2m_defaults[] = { .close = v4l2_encode_close, \ .defaults = v4l2_m2m_defaults, \ .p.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \ - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ + FF_CODEC_CAP_INIT_CLEANUP, \ .p.wrapper_name = "v4l2m2m", \ } diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 7a6b54ab6f..f1f6694f3b 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1337,7 +1337,8 @@ const FFCodec ff_h264_vaapi_encoder = { .p.priv_class = &vaapi_encode_h264_class, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_h264_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 456307d570..d5375add22 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1456,7 +1456,8 @@ const FFCodec ff_hevc_vaapi_encoder = { .p.priv_class = &vaapi_encode_h265_class, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_h265_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index 92960145ac..cf1497a440 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -575,7 +575,8 @@ const FFCodec ff_mjpeg_vaapi_encoder = { .close = &vaapi_encode_mjpeg_close, .p.priv_class = &vaapi_encode_mjpeg_class, .p.capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_mjpeg_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index 01d1b24908..f592043f37 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -699,7 +699,8 @@ const FFCodec ff_mpeg2_vaapi_encoder = { .p.priv_class = &vaapi_encode_mpeg2_class, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_mpeg2_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index e1d7379501..1cb2446c88 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -254,7 +254,8 @@ const FFCodec ff_vp8_vaapi_encoder = { .p.priv_class = &vaapi_encode_vp8_class, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_vp8_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 52373543d3..892ad770c6 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -307,7 +307,8 @@ const FFCodec ff_vp9_vaapi_encoder = { .p.priv_class = &vaapi_encode_vp9_class, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, .defaults = vaapi_encode_vp9_defaults, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VAAPI, From patchwork Sat Jul 9 23:10:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36722 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp477647pzb; Sat, 9 Jul 2022 16:11:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s8We/W9sUabzSMsjAyvmSSPp2y9T8v6qVV1JSz7zhkNxOTcRDBbWO9w09WBs7wKGq+KZ22 X-Received: by 2002:aa7:c784:0:b0:43a:caa8:75b9 with SMTP id n4-20020aa7c784000000b0043acaa875b9mr933474eds.311.1657408276674; Sat, 09 Jul 2022 16:11:16 -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 h11-20020a170906260b00b0071223d9f214si3579920ejc.177.2022.07.09.16.11.16; Sat, 09 Jul 2022 16:11:16 -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=olPpkpXc; 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 EF5D668B98D; Sun, 10 Jul 2022 02:11:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072066.outbound.protection.outlook.com [40.92.72.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B51868B986 for ; Sun, 10 Jul 2022 02:11:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W3en9KdhOw5WeSInoKDeQdNmxY7pGhCoFxDojRVYDMQ7PIMeAVNDrhV3Cqf82O0NzSMqj6yZtU8tUPDPXaam0LeGqBql2qi4GsRFg83KdvA7u/aMSNQ2fiBinbEnom/G2/pb2UDG+VuRVZEf0bnD8ROworE046xKwljh2GH0Dt/yR+ZqaPyaMOptyVY5Nopxjja0wrFdb48zRLA2wPFTtCQOLYais/J/AvnXNHB/vfOLEHFDDK+Q09ykZl2M6lHaa17U8riQ3TnbsE+m4smHy7IBWxuea5CFX6nVZRe3AH8Pu3zeW0x/e0v+Nf/1ZyMrjvoQnj4UOB9CngCuofH4ww== 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=+Lhw2yKsQYhDGJVrKr5i5drr2kT41O3HoNe2n6s0H8g=; b=W2VuyCQOpgHbVxKHwxx9ltk974jVmTUadXOGllwV8iFBDMihOnyEs5ofZ3wPhphjjQTvLu41raMqGIqJ7imfkE7S6SZkIXUd+naocHrgKheYNjFhSHn1fwk3dRutaHZUMgVAMO6Rz/1snHWJUrSCu+TH6IW/nPxYlCOEglubX9imM7GLB4qN9RbA3vEFrpqXZ3W/ycd8gneYoOqmUR4dMritXHbCYJD6Aaz5fKJvReYfNgPk62bh1kIdztA7RD0my8Yoi3uHkCMxtVuASpnepif46gx89f6uuSzBiR4wi3CzzPeL+U3Bt41cJ8Og7HcPJPrx8rUlPtYVr8UGFq7GsQ== 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=+Lhw2yKsQYhDGJVrKr5i5drr2kT41O3HoNe2n6s0H8g=; b=olPpkpXc908lAXAiF7mSaWYlVhXY4p4cWBVBHS7tWQgi5Cjq8/09vLlZCvhYuBv09CnJ7OxvqJSuT3+1AyNEV+HmsDZZ146AvnpNOsZcqPQjcTAIn/t2WfBKgROfOQxXuBaCRztr6bmlrT1zHfJqxbG5SFsAAwGstDAvRdHJeCZVr4DIHTAQZotIzmb4epVEdDahwY9dLE4Ev1ElBR21ILSRfP912ZZlRojFg0HcB7JxPIOHxwRuk+TXrTBnyNZJMRZ7YQV//Wyqes1P70wRq6FY4NqbTAk19gNSXSdPqu+CWv7A4hsp+LyGGDTELxXpy900uEm/E6F+dggvb/LZqw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7753.eurprd01.prod.exchangelabs.com (2603:10a6:10:1e5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Sat, 9 Jul 2022 23:10:42 +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.5417.025; Sat, 9 Jul 2022 23:10:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jul 2022 01:10:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6+IOYgnY93ODd/RwLhUOHTIBmx9yW3Om] X-ClientProxiedBy: FR0P281CA0130.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220709231021.2338914-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47a74d77-07ee-44fc-4655-08da62003e99 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVoS+uEfIl8bNOTZysDTecQ69Bi1mvVzOH/cBXDQBV2rTFrbKH8iq2UDdJ/glSwOWKRpg7WZdJ+8Zik57Laej50OvmZsPCD5+7kBTXt3+eHNFm+scYCLv3wzrM+QdS12gVoUH7uE7fuDADJCadFjrGo9LyFsHQgSsdChm5J0lWfeAWWeYqLtB+rZsQZ+rllt51M+wnSrnXDyFkDDP7I05z+2k2XLuUaABCeNrjf015mIiW9ifoEIrCVPDHdpQ9aVPo+HsJ90AGPF+hg35Q/8Q8V2CoSoSwa0dD0wQhwIGOrvDPwSYeXtke60ChpYsXMVOtj8UJJNNkzjx1YtcappG77kgEemJYB3jBJ2hQmL9IMQCq5KvtkIaCrJM3FFv9I6VvnBMn7PMbexGB2QF/J6DSrY4TyPJRDx5hcou0KlQw8mn+2HJAkR37sCccIUAvGq6IBrNZLbTypjJ+ydJexCGm16hzQHk49cXNB3YQ7phgE0O5HHlfLvPekhvlircoWoHKPjE0PGgLa5HhiDkMV3cVAfTGMHrWT/MuPkBd0gKrNnMCPDUrsoqAmHRN7cZHwQKZX6CQ42JbtdBWmsHF/BUaIs2rVBxQPwYQMli3ninGKDTHBq6Zudmd4KBdGx0w9QDecpKt9vKVfGwlCz8f4dfHSyq6n6FRuYlI/vAumnKcdIY2XfMHxmcd8cxtXhGOR3GFl+l1s6E0mIBCWrFFUYF+E15JzSoy4nrQ= X-MS-TrafficTypeDiagnostic: DBBPR01MB7753:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VkaWk5BSgiSe/uMCj+qQm/oz8zK0hxiOwp9qMRXNDtDwJmgzV6Wmj5ii5Kndek0gX6cIlAhCFhqm8a5kepdbauLja8x/LmCiHTBkgaqjE1mwhwbjExGI6j6eaNG6h9mV2F5z4ic+yTbCyClE1Fmaqb7fTa3KdBlLdoeytNqzTGkqcAiObF8/ZLypEr4JSYZAMnh5rrAqvYwc0ZKPt/rvgm7BE1hdlEfA8PIeXu5fVe5iEbt4x+8pvD6HiOyCogindei36eftRH3FrnG752Ns7LqXpPJnjfM5uXlDVZ42S9p4kZqfyC9nCI7454UCJ687iGZzQcd2S92zEbA98s9vk16Cks9tZLbOr2d05AkCzPODmEmHYE6GyaRBhXfa67kqYDxhNjqEocHf96AKmngLjO4EJ4QlZ1lYm5c9NF3wQ5BqS/34sQ86ahUDTWB/4Y2TyNm/m8o4P+oMH620aG5V3w5RC5BAIrfPBS9rE3p5PrzRY4YDCtNLOi/Dj2NXrci5wFog4ByDuhHCImnjPaDyBV7g8qGJqehSnNFqVx5m08zRJr4hErZ8SW1BclYgQDH83qKqgDKjSB0MuOdaPC62meM+4RysSVSreScphw1q4MQt8fHtuiiOHQvRT2t1XbzESZCqpQDPTIORlfLbfX8XJX9NrGJUI3as6zwJmd2SlGWWdDCnKjX8nYLeM7H1o/SdTvc0H5KAjqIve4DwwWGSHA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PI1cE+duhjTzTVrc6P3/Y/TXrX12obIZdapga4M3ZD3Y4yELN7JL1xlsecHM2AKCw1q6q5T9wRNSM1zofdON53UTryYj4D6FV7doG2G1o0V/UtF55efwhGQXjeGVkmnVU04COftknWOeD0lkc78mokIZM9JvY8k7BYjy8+R3VHUfI9OR53pMZ5c8ClYCxuOE2SPez0W1W4Kf6ydyjBWBfPeMurh+w9JVoesDgx7PjkGpPymYiZ//gNKsjG3vzq5tTRj/iuFQ94nqHSJp8Xrj5K5d83/8e5sJZEMKf6I9Vvl7FxhC4Vn4N28zN998HFqMtIljYcrNrpGxXVGaeIdvLVA2Nxa8AFSV3MHJJ2TIJHZ7fd7HB5DfU3bGXBN2TH+/BveBwT64yEa04edovfEQykXJeUXsokwrucYGqbLo2lUQcI1IdCXEsrWfT7roRiG4eSa41xg1YgXX4wSspxpz+6wraNAfs3VQXt0dljl+M+P9893bFmK/Qjr52BQhp5ENIwr6b63I8wHncWgOFsmMEMCGF5JRP+KNO23Tri0AQPOHU7DS4iKu35mrloQ3eZUcinAxU764w7Q9WJw3qflTgC2e/3LrHyCMiNm6WjrtkzDWsHJb9TMb1MMGD5/Opx951VBuhxvPiUMa5Noi+e8xFNr2VF0Hz8MZNzk3BaBmJTrJSwzcjTpE02xfpc+OIeSOalNNotCaizOeA7y9KzNAJ89glEkys1/wtAvEUiYGrN1nYRjCmARIzcA7dqCjRsmUKQV68aN4zcpB5VsMS6c3ZIKueVaUGXBoSC1vLKjsJABv+cqhiFFClKqCGZMCZCxvuCnbjXmNf64D7k7jlPnBWTJyd6ZtyU7WIAccRKIzqH7Bd1ny3bO2klR0i8anspzHv/6IqM5NIC0nYoOj9h5H6HZfvY6jSjz+kkUxx9rhJj1D+DxwdoOLwWLkDa3ZgCt1JYLfy3IhksDQwYcjw2AVpRrFWJA9k3rH2WofTH6JJBdLTue//wIsIcKqXXO4MtW7w15x4Kd2AgUP0d7QgPaXTZJufNZttDJ3eethncG3VGIH1XdKKzWfxh6PkZJFflAaexUXCdWB9OV/7kBgp61T54SqJ6YQ3SikpuSNmLrtL0SpGJP3Ok5w1dspD56w51y/kd3TDA8Kl23EtVHQcFtYP2swrRAmbo9YxoCd+9HSo//JriyjwYztonbJAyCEihenplvwNhRPQK8RDX2nunMj52uu85CKFH7G30TEazI5IlF0F95eTUu9VGlBhbRJqbTd3Jq9Bph1rfnHyOwL7QH7jw8JIoGpMeTryl2gZ6qXjGI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47a74d77-07ee-44fc-4655-08da62003e99 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2022 23:10:42.0475 (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: DBBPR01MB7753 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec: Make init-threadsafety the default 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: +2/o8wiMjEOU and remove FF_CODEC_CAP_INIT_THREADSAFE All our native codecs are already init-threadsafe (only wrappers for external libraries and hwaccels are typically not marked as init-threadsafe yet), so it is only natural for this to also be the default state. Signed-off-by: Andreas Rheinhardt --- One could now also remove the check for "codec->init" from (un)lock_avcodec. It wouldn't matter. libavcodec/012v.c | 1 - libavcodec/4xm.c | 2 +- libavcodec/8bps.c | 1 - libavcodec/8svx.c | 2 -- libavcodec/a64multienc.c | 4 ++-- libavcodec/aacdec.c | 4 ++-- libavcodec/aacdec_fixed.c | 2 +- libavcodec/aacenc.c | 2 +- libavcodec/aasc.c | 1 - libavcodec/ac3dec_fixed.c | 2 +- libavcodec/ac3dec_float.c | 4 ++-- libavcodec/ac3enc_fixed.c | 2 +- libavcodec/ac3enc_float.c | 2 +- libavcodec/adpcm.c | 1 - libavcodec/adpcmenc.c | 2 +- libavcodec/adxdec.c | 1 - libavcodec/adxenc.c | 1 - libavcodec/agm.c | 3 +-- libavcodec/aic.c | 1 - libavcodec/alac.c | 2 +- libavcodec/alacenc.c | 1 - libavcodec/alsdec.c | 2 +- libavcodec/amrnbdec.c | 1 - libavcodec/amrwbdec.c | 1 - libavcodec/anm.c | 1 - libavcodec/ansi.c | 1 - libavcodec/apedec.c | 2 +- libavcodec/aptxdec.c | 2 -- libavcodec/aptxenc.c | 2 -- libavcodec/arbc.c | 2 +- libavcodec/argo.c | 2 +- libavcodec/assdec.c | 2 -- libavcodec/assenc.c | 2 -- libavcodec/asvdec.c | 2 -- libavcodec/asvenc.c | 2 -- libavcodec/atrac1.c | 2 +- libavcodec/atrac3.c | 4 ++-- libavcodec/atrac3plusdec.c | 4 ++-- libavcodec/atrac9dec.c | 2 +- libavcodec/audiotoolboxdec.c | 2 +- libavcodec/audiotoolboxenc.c | 1 - libavcodec/aura.c | 1 - libavcodec/av1dec.c | 3 +-- libavcodec/avcodec.c | 4 ++-- libavcodec/avrndec.c | 2 +- libavcodec/avs.c | 1 - libavcodec/avuidec.c | 1 - libavcodec/avuienc.c | 1 - libavcodec/bethsoftvideo.c | 1 - libavcodec/bfi.c | 1 - libavcodec/bink.c | 2 +- libavcodec/binkaudio.c | 4 ++-- libavcodec/bintext.c | 3 --- libavcodec/bitpacked_dec.c | 1 - libavcodec/bitpacked_enc.c | 1 - libavcodec/bmpenc.c | 1 - libavcodec/bmvaudio.c | 1 - libavcodec/bmvvideo.c | 1 - libavcodec/c93.c | 2 +- libavcodec/cavsdec.c | 2 +- libavcodec/ccaption_dec.c | 1 - libavcodec/cdgraphics.c | 1 - libavcodec/cdtoons.c | 1 - libavcodec/cdxl.c | 1 - libavcodec/cfhd.c | 2 +- libavcodec/cfhdenc.c | 2 +- libavcodec/cinepak.c | 1 - libavcodec/cinepakenc.c | 2 +- libavcodec/clearvideo.c | 2 +- libavcodec/cljrdec.c | 1 - libavcodec/cllc.c | 1 - libavcodec/cngdec.c | 3 +-- libavcodec/cngenc.c | 2 +- libavcodec/codec_internal.h | 7 +------ libavcodec/cook.c | 2 +- libavcodec/cpia.c | 1 - libavcodec/cri.c | 2 +- libavcodec/cscd.c | 2 +- libavcodec/cyuv.c | 2 -- libavcodec/dcadec.c | 2 +- libavcodec/dcaenc.c | 2 +- libavcodec/dds.c | 1 - libavcodec/dfa.c | 1 - libavcodec/dfpwmdec.c | 1 - libavcodec/dfpwmenc.c | 1 - libavcodec/diracdec.c | 1 - libavcodec/dnxhddec.c | 1 - libavcodec/dnxhdenc.c | 2 +- libavcodec/dolby_e.c | 2 +- libavcodec/dpcm.c | 1 - libavcodec/dpxenc.c | 1 - libavcodec/dsddec.c | 1 - libavcodec/dsicinaudio.c | 1 - libavcodec/dsicinvideo.c | 2 +- libavcodec/dss_sp.c | 1 - libavcodec/dstdec.c | 1 - libavcodec/dvaudiodec.c | 1 - libavcodec/dvbsubdec.c | 1 - libavcodec/dvdec.c | 1 - libavcodec/dvdsubdec.c | 1 - libavcodec/dvdsubenc.c | 1 - libavcodec/dvenc.c | 1 - libavcodec/dxa.c | 2 +- libavcodec/dxv.c | 3 +-- libavcodec/eac3enc.c | 2 +- libavcodec/eacmv.c | 2 +- libavcodec/eamad.c | 1 - libavcodec/eatgq.c | 1 - libavcodec/eatgv.c | 1 - libavcodec/eatqi.c | 1 - libavcodec/escape124.c | 1 - libavcodec/escape130.c | 2 +- libavcodec/evrcdec.c | 1 - libavcodec/exr.c | 1 - libavcodec/exrenc.c | 1 - libavcodec/fastaudio.c | 1 - libavcodec/ffv1dec.c | 2 +- libavcodec/ffv1enc.c | 2 +- libavcodec/ffwavesynth.c | 2 +- libavcodec/fic.c | 1 - libavcodec/flacdec.c | 1 - libavcodec/flacenc.c | 2 +- libavcodec/flashsv.c | 4 ++-- libavcodec/flashsv2enc.c | 2 +- libavcodec/flashsvenc.c | 1 - libavcodec/flicvideo.c | 1 - libavcodec/flvdec.c | 3 +-- libavcodec/flvenc.c | 2 +- libavcodec/fmvc.c | 3 +-- libavcodec/fraps.c | 1 - libavcodec/frwu.c | 1 - libavcodec/g2meet.c | 2 +- libavcodec/g722dec.c | 1 - libavcodec/g722enc.c | 2 +- libavcodec/g723_1dec.c | 1 - libavcodec/g723_1enc.c | 1 - libavcodec/g726.c | 4 ---- libavcodec/g729dec.c | 2 -- libavcodec/gdv.c | 1 - libavcodec/gif.c | 2 +- libavcodec/gifdec.c | 3 +-- libavcodec/gsmdec.c | 2 -- libavcodec/h261dec.c | 1 - libavcodec/h261enc.c | 2 +- libavcodec/h263dec.c | 6 ++---- libavcodec/h264dec.c | 2 +- libavcodec/hapdec.c | 3 +-- libavcodec/hapenc.c | 3 +-- libavcodec/hcadec.c | 2 +- libavcodec/hcom.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/hnm4video.c | 2 +- libavcodec/hq_hqa.c | 3 +-- libavcodec/hqx.c | 3 +-- libavcodec/huffyuvdec.c | 6 +++--- libavcodec/huffyuvenc.c | 6 ++---- libavcodec/idcinvideo.c | 1 - libavcodec/iff.c | 2 +- libavcodec/ilbcdec.c | 1 - libavcodec/imc.c | 2 -- libavcodec/imm4.c | 3 +-- libavcodec/imm5.c | 3 +-- libavcodec/imx.c | 3 +-- libavcodec/indeo2.c | 1 - libavcodec/indeo3.c | 2 +- libavcodec/indeo4.c | 1 - libavcodec/indeo5.c | 2 +- libavcodec/intelh263dec.c | 3 +-- libavcodec/interplayacm.c | 2 +- libavcodec/interplayvideo.c | 2 +- libavcodec/ituh263enc.c | 4 ++-- libavcodec/j2kenc.c | 2 +- libavcodec/jacosubdec.c | 1 - libavcodec/jpeg2000dec.c | 1 - libavcodec/jpeglsdec.c | 2 +- libavcodec/jpeglsenc.c | 3 +-- libavcodec/jvdec.c | 1 - libavcodec/kgv1dec.c | 1 - libavcodec/kmvc.c | 1 - libavcodec/lagarith.c | 1 - libavcodec/lcldec.c | 4 ++-- libavcodec/lclenc.c | 3 +-- libavcodec/libdav1d.c | 2 +- libavcodec/libfdk-aacdec.c | 3 +-- libavcodec/libkvazaar.c | 2 +- libavcodec/libopenh264dec.c | 2 +- libavcodec/libopenh264enc.c | 2 +- libavcodec/libx264.c | 8 ++------ libavcodec/libxvid.c | 3 +-- libavcodec/ljpegenc.c | 1 - libavcodec/loco.c | 1 - libavcodec/lscrdec.c | 2 +- libavcodec/m101.c | 1 - libavcodec/mace.c | 2 -- libavcodec/magicyuv.c | 1 - libavcodec/magicyuvenc.c | 2 +- libavcodec/mdec.c | 1 - libavcodec/metasound.c | 2 +- libavcodec/mfenc.c | 3 +-- libavcodec/microdvddec.c | 1 - libavcodec/midivid.c | 2 +- libavcodec/mimic.c | 2 +- libavcodec/mjpegbdec.c | 2 +- libavcodec/mjpegdec.c | 6 +++--- libavcodec/mjpegenc.c | 4 ++-- libavcodec/mlpdec.c | 2 -- libavcodec/mlpenc.c | 4 ++-- libavcodec/mmvideo.c | 1 - libavcodec/mobiclip.c | 2 +- libavcodec/motionpixels.c | 2 +- libavcodec/movtextdec.c | 1 - libavcodec/movtextenc.c | 2 +- libavcodec/mpc7.c | 1 - libavcodec/mpc8.c | 1 - libavcodec/mpeg12dec.c | 11 ++++------- libavcodec/mpeg12enc.c | 4 ++-- libavcodec/mpeg4videodec.c | 3 +-- libavcodec/mpeg4videoenc.c | 2 +- libavcodec/mpegaudiodec_fixed.c | 6 +----- libavcodec/mpegaudiodec_float.c | 6 +----- libavcodec/mpegaudioenc_fixed.c | 1 - libavcodec/mpegaudioenc_float.c | 1 - libavcodec/mpl2dec.c | 1 - libavcodec/mscc.c | 4 ++-- libavcodec/msmpeg4dec.c | 12 ++++-------- libavcodec/msmpeg4enc.c | 6 +++--- libavcodec/msrle.c | 1 - libavcodec/mss1.c | 1 - libavcodec/mss2.c | 1 - libavcodec/mss3.c | 2 +- libavcodec/mss4.c | 2 +- libavcodec/msvideo1.c | 1 - libavcodec/msvideo1enc.c | 1 - libavcodec/mv30.c | 3 +-- libavcodec/mvcdec.c | 2 -- libavcodec/mvha.c | 3 +-- libavcodec/mwsc.c | 3 +-- libavcodec/mxpegdec.c | 2 +- libavcodec/nellymoserdec.c | 1 - libavcodec/nellymoserenc.c | 2 +- libavcodec/notchlc.c | 1 - libavcodec/nuv.c | 2 +- libavcodec/omx.c | 4 ++-- libavcodec/on2avc.c | 2 +- libavcodec/opusdec.c | 2 +- libavcodec/opusenc.c | 2 +- libavcodec/pafaudio.c | 1 - libavcodec/pafvideo.c | 2 +- libavcodec/pamenc.c | 1 - libavcodec/pcm-blurayenc.c | 1 - libavcodec/pcm-dvd.c | 1 - libavcodec/pcm-dvdenc.c | 1 - libavcodec/pcm.c | 2 -- libavcodec/pcxenc.c | 1 - libavcodec/pgssubdec.c | 1 - libavcodec/photocd.c | 1 - libavcodec/pixlet.c | 3 +-- libavcodec/pngdec.c | 4 ++-- libavcodec/pngenc.c | 2 -- libavcodec/pnmdec.c | 1 - libavcodec/pnmenc.c | 6 ------ libavcodec/proresdec2.c | 1 - libavcodec/proresenc_anatoliy.c | 4 ++-- libavcodec/proresenc_kostya.c | 2 +- libavcodec/prosumer.c | 3 +-- libavcodec/qcelpdec.c | 1 - libavcodec/qdm2.c | 1 - libavcodec/qdmc.c | 1 - libavcodec/qoienc.c | 1 - libavcodec/qpeg.c | 3 +-- libavcodec/qtrle.c | 1 - libavcodec/qtrleenc.c | 2 +- libavcodec/r210dec.c | 3 --- libavcodec/r210enc.c | 3 --- libavcodec/ra144dec.c | 1 - libavcodec/ra144enc.c | 1 - libavcodec/ra288.c | 1 - libavcodec/ralf.c | 2 +- libavcodec/rasc.c | 3 +-- libavcodec/rawdec.c | 1 - libavcodec/rawenc.c | 1 - libavcodec/realtextdec.c | 1 - libavcodec/rl2.c | 1 - libavcodec/roqaudioenc.c | 1 - libavcodec/roqvideodec.c | 2 +- libavcodec/roqvideoenc.c | 2 +- libavcodec/rpza.c | 1 - libavcodec/rpzaenc.c | 1 - libavcodec/rscc.c | 3 +-- libavcodec/rv10.c | 2 -- libavcodec/rv10enc.c | 2 +- libavcodec/rv20enc.c | 2 +- libavcodec/rv30.c | 3 +-- libavcodec/rv40.c | 3 +-- libavcodec/s302menc.c | 1 - libavcodec/samidec.c | 1 - libavcodec/sanm.c | 1 - libavcodec/sbcdec.c | 1 - libavcodec/sbcenc.c | 1 - libavcodec/scpr.c | 3 +-- libavcodec/screenpresso.c | 3 +-- libavcodec/sga.c | 1 - libavcodec/sgidec.c | 1 - libavcodec/sgienc.c | 1 - libavcodec/sgirledec.c | 1 - libavcodec/shorten.c | 1 - libavcodec/sipr.c | 1 - libavcodec/siren.c | 6 ++---- libavcodec/smacker.c | 3 +-- libavcodec/smc.c | 1 - libavcodec/smcenc.c | 1 - libavcodec/snowdec.c | 3 +-- libavcodec/snowenc.c | 3 +-- libavcodec/sonic.c | 6 +++--- libavcodec/sp5xdec.c | 4 ++-- libavcodec/speedhq.c | 1 - libavcodec/speedhqenc.c | 2 +- libavcodec/speexdec.c | 2 +- libavcodec/srtdec.c | 2 -- libavcodec/srtenc.c | 3 --- libavcodec/subviewerdec.c | 1 - libavcodec/sunrastenc.c | 1 - libavcodec/svq1dec.c | 1 - libavcodec/svq1enc.c | 2 +- libavcodec/svq3.c | 2 +- libavcodec/takdec.c | 1 - libavcodec/targa_y216dec.c | 1 - libavcodec/targaenc.c | 1 - libavcodec/tdsc.c | 3 +-- libavcodec/textdec.c | 5 ----- libavcodec/tiertexseqv.c | 1 - libavcodec/tiff.c | 2 +- libavcodec/tiffenc.c | 1 - libavcodec/tmv.c | 1 - libavcodec/truemotion1.c | 2 +- libavcodec/truemotion2.c | 2 +- libavcodec/truemotion2rt.c | 1 - libavcodec/truespeech.c | 1 - libavcodec/tscc.c | 2 +- libavcodec/tscc2.c | 2 +- libavcodec/tta.c | 2 +- libavcodec/ttaenc.c | 1 - libavcodec/ttmlenc.c | 2 +- libavcodec/twinvqdec.c | 2 +- libavcodec/ulti.c | 1 - libavcodec/utvideodec.c | 1 - libavcodec/utvideoenc.c | 2 +- libavcodec/v210dec.c | 1 - libavcodec/v210enc.c | 1 - libavcodec/v210x.c | 1 - libavcodec/v308dec.c | 1 - libavcodec/v308enc.c | 1 - libavcodec/v408dec.c | 2 -- libavcodec/v408enc.c | 2 -- libavcodec/v410dec.c | 1 - libavcodec/v410enc.c | 1 - libavcodec/vb.c | 2 +- libavcodec/vble.c | 1 - libavcodec/vbndec.c | 1 - libavcodec/vbnenc.c | 3 +-- libavcodec/vc1dec.c | 4 ---- libavcodec/vc2enc.c | 2 +- libavcodec/vcr1.c | 1 - libavcodec/videotoolboxenc.c | 9 +++------ libavcodec/vima.c | 1 - libavcodec/vmdaudio.c | 1 - libavcodec/vmdvideo.c | 2 +- libavcodec/vmnc.c | 1 - libavcodec/vorbisdec.c | 2 +- libavcodec/vorbisenc.c | 2 +- libavcodec/vp3.c | 6 +++--- libavcodec/vp5.c | 2 +- libavcodec/vp6.c | 6 +++--- libavcodec/vp8.c | 4 +--- libavcodec/vp9.c | 2 +- libavcodec/vqavideo.c | 2 +- libavcodec/wavpack.c | 2 +- libavcodec/wavpackenc.c | 1 - libavcodec/wcmv.c | 3 +-- libavcodec/webp.c | 1 - libavcodec/webvttdec.c | 1 - libavcodec/webvttenc.c | 1 - libavcodec/wmadec.c | 4 ++-- libavcodec/wmaenc.c | 4 ++-- libavcodec/wmalosslessdec.c | 2 +- libavcodec/wmaprodec.c | 6 +++--- libavcodec/wmavoice.c | 2 +- libavcodec/wmv2dec.c | 2 +- libavcodec/wmv2enc.c | 2 +- libavcodec/wnv1.c | 1 - libavcodec/wrapped_avframe.c | 2 -- libavcodec/ws-snd1.c | 1 - libavcodec/xan.c | 2 +- libavcodec/xfacedec.c | 1 - libavcodec/xl.c | 1 - libavcodec/xsubdec.c | 1 - libavcodec/xsubenc.c | 1 - libavcodec/xxan.c | 2 +- libavcodec/y41pdec.c | 1 - libavcodec/y41penc.c | 1 - libavcodec/ylc.c | 1 - libavcodec/yop.c | 1 - libavcodec/yuv4dec.c | 1 - libavcodec/zerocodec.c | 3 +-- libavcodec/zmbv.c | 2 +- libavcodec/zmbvenc.c | 2 +- 406 files changed, 242 insertions(+), 571 deletions(-) diff --git a/libavcodec/012v.c b/libavcodec/012v.c index c03afd0bc7..805aaed221 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -152,5 +152,4 @@ const FFCodec ff_zero12v_decoder = { .init = zero12v_decode_init, FF_CODEC_DECODE_CB(zero12v_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 7b88631a6b..8941d715fa 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -1036,5 +1036,5 @@ const FFCodec ff_fourxm_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 95a35159e3..3bac9f64c4 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -182,5 +182,4 @@ const FFCodec ff_eightbps_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 6eb90834b9..0af68d2d9a 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -199,7 +199,6 @@ const FFCodec ff_eightsvx_fib_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_EIGHTSVX_EXP_DECODER @@ -215,6 +214,5 @@ const FFCodec ff_eightsvx_exp_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index e80139ee51..ba774bf59f 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -404,7 +404,7 @@ const FFCodec ff_a64multi_encoder = { FF_CODEC_ENCODE_CB(a64multi_encode_frame), .close = a64multi_close_encoder, .p.pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_A64MULTI5_ENCODER @@ -419,6 +419,6 @@ const FFCodec ff_a64multi5_encoder = { FF_CODEC_ENCODE_CB(a64multi_encode_frame), .close = a64multi_close_encoder, .p.pix_fmts = (const enum AVPixelFormat[]) {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 88c128f396..c09c3ee547 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -565,7 +565,7 @@ const FFCodec ff_aac_decoder = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = aac_channel_layout, #endif @@ -593,7 +593,7 @@ const FFCodec ff_aac_latm_decoder = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = aac_channel_layout, #endif diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c index c7ac75024f..392a85e46a 100644 --- a/libavcodec/aacdec_fixed.c +++ b/libavcodec/aacdec_fixed.c @@ -463,7 +463,7 @@ const FFCodec ff_aac_fixed_decoder = { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = aac_channel_layout, #endif diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 408c03144c..ee179542bd 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1150,7 +1150,7 @@ const FFCodec ff_aac_encoder = { .close = aac_encode_end, .defaults = aac_encode_defaults, .p.supported_samplerates = ff_mpeg4audio_sample_rates, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 528ee58cdf..d6afa35b86 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -159,5 +159,4 @@ const FFCodec ff_aasc_decoder = { .close = aasc_decode_end, FF_CODEC_DECODE_CB(aasc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index 4c0d4d6f5c..29f2acc6f2 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -183,5 +183,5 @@ const FFCodec ff_ac3_fixed_decoder = { AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 2147b36afe..26fbd78d8b 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -73,7 +73,7 @@ const FFCodec ff_ac3_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ac3_eac3_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_EAC3_DECODER @@ -91,6 +91,6 @@ const FFCodec ff_eac3_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ac3_eac3_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 92bf31b039..fe434afc26 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -133,7 +133,7 @@ const FFCodec ff_ac3_fixed_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ff_ac3enc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.supported_samplerates = ff_ac3_sample_rate_tab, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = ff_ac3_channel_layouts, diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 9f5341cf2d..666b53708b 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -143,6 +143,6 @@ const FFCodec ff_ac3_encoder = { #endif .p.ch_layouts = ff_ac3_ch_layouts, .defaults = ff_ac3_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index b2ef7dfbec..c4bcafbb7e 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2296,7 +2296,6 @@ const FFCodec ff_ ## name_ ## _decoder = { \ .init = adpcm_decode_init, \ FF_CODEC_DECODE_CB(adpcm_decode_frame), \ .flush = adpcm_flush, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ }; #define ADPCM_DECODER_2(enabled, codec_id, name, sample_fmts, long_name) \ ADPCM_DECODER_ ## enabled(codec_id, name, sample_fmts, long_name) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 4ff77662b4..169a95046d 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -1009,7 +1009,7 @@ const FFCodec ff_ ## name_ ## _encoder = { \ .init = adpcm_encode_init, \ FF_CODEC_ENCODE_CB(adpcm_encode_frame), \ .close = adpcm_encode_close, \ - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, \ + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ }; #define ADPCM_ENCODER_2(enabled, codec_id, name, sample_fmts, capabilities, long_name) \ ADPCM_ENCODER_ ## enabled(codec_id, name, sample_fmts, capabilities, long_name) diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 1ebc250e47..b5c09eaae5 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -203,5 +203,4 @@ const FFCodec ff_adpcm_adx_decoder = { AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index 9277cab7c9..0a2e5092cd 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -200,5 +200,4 @@ const FFCodec ff_adpcm_adx_encoder = { FF_CODEC_ENCODE_CB(adx_encode_frame), .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 27438dd1a4..0f65a820ca 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -1296,7 +1296,6 @@ const FFCodec ff_agm_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_EXPORTS_CROPPING, }; diff --git a/libavcodec/aic.c b/libavcodec/aic.c index 5f0eec6b80..21ce778146 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -505,5 +505,4 @@ const FFCodec ff_aic_decoder = { .close = aic_decode_close, FF_CODEC_DECODE_CB(aic_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 9aaf7066b2..b232514169 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -620,6 +620,6 @@ const FFCodec ff_alac_decoder = { .close = alac_decode_close, FF_CODEC_DECODE_CB(alac_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &alac_class }; diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 72ce65e265..10dab0a67c 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -667,6 +667,5 @@ const FFCodec ff_alac_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 7031fa0acb..38c823ffa1 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2189,5 +2189,5 @@ const FFCodec ff_als_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = flush, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index f67ed1d02e..8c1073916e 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1107,5 +1107,4 @@ const FFCodec ff_amrnb_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 7566f250d2..6a5b79f52c 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1303,5 +1303,4 @@ const FFCodec ff_amrwb_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/anm.c b/libavcodec/anm.c index a9006be9c0..a66ee1e65b 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -199,5 +199,4 @@ const FFCodec ff_anm_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index ff4437cc61..a6b15c728f 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -490,6 +490,5 @@ const FFCodec ff_ansi_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .defaults = ansi_defaults, }; diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index a7c38bce1b..26183067a8 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1669,7 +1669,7 @@ const FFCodec ff_ape_decoder = { FF_CODEC_DECODE_CB(ape_decode_frame), .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .flush = ape_flush, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index 6ac070ba99..27cf056751 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -183,7 +183,6 @@ const FFCodec ff_aptx_decoder = { .init = ff_aptx_init, FF_CODEC_DECODE_CB(aptx_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, #endif @@ -203,7 +202,6 @@ const FFCodec ff_aptx_hd_decoder = { .init = ff_aptx_init, FF_CODEC_DECODE_CB(aptx_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, #endif diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 89ab3974c5..453146f154 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -255,7 +255,6 @@ const FFCodec ff_aptx_encoder = { .init = ff_aptx_init, FF_CODEC_ENCODE_CB(aptx_encode_frame), .close = aptx_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, #endif @@ -277,7 +276,6 @@ const FFCodec ff_aptx_hd_encoder = { .init = ff_aptx_init, FF_CODEC_ENCODE_CB(aptx_encode_frame), .close = aptx_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_STEREO, 0}, #endif diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 78600963eb..d981d2228b 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -222,5 +222,5 @@ const FFCodec ff_arbc_decoder = { .flush = decode_flush, .close = decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/argo.c b/libavcodec/argo.c index efd1056f16..b772e9c565 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -744,5 +744,5 @@ const FFCodec ff_argo_decoder = { .flush = decode_flush, .close = decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index f43b500aa7..b189645545 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -69,7 +69,6 @@ const FFCodec ff_ssa_decoder = { .p.id = AV_CODEC_ID_ASS, .init = ass_decode_init, FF_CODEC_DECODE_SUB_CB(ass_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -81,6 +80,5 @@ const FFCodec ff_ass_decoder = { .p.id = AV_CODEC_ID_ASS, .init = ass_decode_init, FF_CODEC_DECODE_SUB_CB(ass_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index 2ac40d5afe..b024b1b0ed 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -76,7 +76,6 @@ const FFCodec ff_ssa_encoder = { .p.id = AV_CODEC_ID_ASS, .init = ass_encode_init, FF_CODEC_ENCODE_SUB_CB(ass_encode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -88,6 +87,5 @@ const FFCodec ff_ass_encoder = { .p.id = AV_CODEC_ID_ASS, .init = ass_encode_init, FF_CODEC_ENCODE_SUB_CB(ass_encode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 57ba4c5b5e..5bb4600084 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -338,7 +338,6 @@ const FFCodec ff_asv1_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -352,6 +351,5 @@ const FFCodec ff_asv2_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 520173e6c9..c6fd6a519e 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -353,7 +353,6 @@ const FFCodec ff_asv1_encoder = { FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -368,6 +367,5 @@ const FFCodec ff_asv2_encoder = { FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 7265891ac1..a05fb6e801 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -396,5 +396,5 @@ const FFCodec ff_atrac1_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index d5f6fea4d4..93f5f4d2d6 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -1027,7 +1027,7 @@ const FFCodec ff_atrac3_decoder = { .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_atrac3al_decoder = { @@ -1042,5 +1042,5 @@ const FFCodec ff_atrac3al_decoder = { .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c index f87ffb8938..644a7e87c6 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -396,7 +396,7 @@ const FFCodec ff_atrac3p_decoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3P, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(ATRAC3PContext), .init = atrac3p_decode_init, .close = atrac3p_decode_close, @@ -409,7 +409,7 @@ const FFCodec ff_atrac3pal_decoder = { .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ATRAC3PAL, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(ATRAC3PContext), .init = atrac3p_decode_init, .close = atrac3p_decode_close, diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 6c1f0d1759..3c572560c1 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -997,6 +997,6 @@ const FFCodec ff_atrac9_decoder = { .close = atrac9_decode_close, FF_CODEC_DECODE_CB(atrac9_decode_frame), .flush = atrac9_decode_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, }; diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index daccf4abf8..dc3f790636 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -602,7 +602,7 @@ static av_cold int ffat_close_decoder(AVCodecContext *avctx) .p.priv_class = &ffat_##NAME##_dec_class, \ .bsfs = bsf_name, \ .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, \ + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ .p.wrapper_name = "at", \ }; diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 00293154bf..d8cc62423a 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -634,7 +634,6 @@ static const AVOption options[] = { AV_SAMPLE_FMT_S16, \ AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NONE \ }, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ .p.profiles = PROFILES, \ .p.wrapper_name = "at", \ }; diff --git a/libavcodec/aura.c b/libavcodec/aura.c index b4167cacfd..23e976f219 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -104,5 +104,4 @@ const FFCodec ff_aura2_decoder = { .init = aura_decode_init, FF_CODEC_DECODE_CB(aura_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index dd83373dd6..8abb7b3b34 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1255,8 +1255,7 @@ const FFCodec ff_av1_decoder = { .close = av1_decode_free, FF_CODEC_DECODE_CB(av1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, .flush = av1_decode_flush, .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 5f6e71a39e..fb11440e5d 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -72,13 +72,13 @@ static AVMutex codec_mutex = AV_MUTEX_INITIALIZER; static void lock_avcodec(const FFCodec *codec) { - if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) + if (codec->caps_internal & FF_CODEC_CAP_NOT_INIT_THREADSAFE && codec->init) ff_mutex_lock(&codec_mutex); } static void unlock_avcodec(const FFCodec *codec) { - if (!(codec->caps_internal & FF_CODEC_CAP_INIT_THREADSAFE) && codec->init) + if (codec->caps_internal & FF_CODEC_CAP_NOT_INIT_THREADSAFE && codec->init) ff_mutex_unlock(&codec_mutex); } diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index 9bb0c1ffa2..10bde74172 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -98,5 +98,5 @@ const FFCodec ff_avrn_decoder = { .init = init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 6dda3393b5..20c07aeeed 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -185,5 +185,4 @@ const FFCodec ff_avs_decoder = { FF_CODEC_DECODE_CB(avs_decode_frame), .close = avs_decode_end, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/avuidec.c b/libavcodec/avuidec.c index f545c41154..ce96219bf5 100644 --- a/libavcodec/avuidec.c +++ b/libavcodec/avuidec.c @@ -127,5 +127,4 @@ const FFCodec ff_avui_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .init = avui_decode_init, FF_CODEC_DECODE_CB(avui_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c index e2bd3181f5..a54612ff28 100644 --- a/libavcodec/avuienc.c +++ b/libavcodec/avuienc.c @@ -100,5 +100,4 @@ const FFCodec ff_avui_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_UYVY422, AV_PIX_FMT_NONE }, .init = avui_encode_init, FF_CODEC_ENCODE_CB(avui_encode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 9fc286fb00..a2e8f412d6 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -168,5 +168,4 @@ const FFCodec ff_bethsoftvid_decoder = { .close = bethsoftvid_decode_end, FF_CODEC_DECODE_CB(bethsoftvid_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 6f9fbb0e96..12eba8f399 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -185,5 +185,4 @@ const FFCodec ff_bfi_decoder = { .close = bfi_decode_close, FF_CODEC_DECODE_CB(bfi_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bink.c b/libavcodec/bink.c index ae2c65f19f..09be0488de 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1430,5 +1430,5 @@ const FFCodec ff_bink_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 8bac8e03f3..372c439691 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -376,7 +376,7 @@ const FFCodec ff_binkaudio_rdft_decoder = { .close = decode_end, FF_CODEC_RECEIVE_FRAME_CB(binkaudio_receive_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_binkaudio_dct_decoder = { @@ -390,5 +390,5 @@ const FFCodec ff_binkaudio_dct_decoder = { .close = decode_end, FF_CODEC_RECEIVE_FRAME_CB(binkaudio_receive_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index e153198c32..7039760c19 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -226,7 +226,6 @@ const FFCodec ff_bintext_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_XBIN_DECODER @@ -239,7 +238,6 @@ const FFCodec ff_xbin_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_IDF_DECODER @@ -252,6 +250,5 @@ const FFCodec ff_idf_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/bitpacked_dec.c b/libavcodec/bitpacked_dec.c index 4723a3c7eb..8a375fe08b 100644 --- a/libavcodec/bitpacked_dec.c +++ b/libavcodec/bitpacked_dec.c @@ -154,5 +154,4 @@ const FFCodec ff_bitpacked_decoder = { MKTAG('U', 'Y', 'V', 'Y'), FF_CODEC_TAGS_END, }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bitpacked_enc.c b/libavcodec/bitpacked_enc.c index 127f1af59b..f3ddbb2a88 100644 --- a/libavcodec/bitpacked_enc.c +++ b/libavcodec/bitpacked_enc.c @@ -115,5 +115,4 @@ const FFCodec ff_bitpacked_encoder = { FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index f28ce01f59..78f64edb1c 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -170,5 +170,4 @@ const FFCodec ff_bmp_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bmvaudio.c b/libavcodec/bmvaudio.c index f57ece0320..08f24c3c8b 100644 --- a/libavcodec/bmvaudio.c +++ b/libavcodec/bmvaudio.c @@ -86,5 +86,4 @@ const FFCodec ff_bmv_audio_decoder = { .init = bmv_aud_decode_init, FF_CODEC_DECODE_CB(bmv_aud_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c index c492d7fcfa..9872396990 100644 --- a/libavcodec/bmvvideo.c +++ b/libavcodec/bmvvideo.c @@ -294,5 +294,4 @@ const FFCodec ff_bmv_video_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 050bb42741..196b95e428 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -268,5 +268,5 @@ const FFCodec ff_c93_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 6c69c2c94e..7ac4359123 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1326,5 +1326,5 @@ const FFCodec ff_cavs_decoder = { FF_CODEC_DECODE_CB(cavs_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = cavs_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 34f0513b1a..13648ff306 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -956,5 +956,4 @@ const FFCodec ff_ccaption_decoder = { .close = close_decoder, .flush = flush_decoder, FF_CODEC_DECODE_SUB_CB(decode), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 73654019e6..0070d9b8e6 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -398,5 +398,4 @@ const FFCodec ff_cdgraphics_decoder = { FF_CODEC_DECODE_CB(cdg_decode_frame), .flush = cdg_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cdtoons.c b/libavcodec/cdtoons.c index eb53a324db..c1b4577dca 100644 --- a/libavcodec/cdtoons.c +++ b/libavcodec/cdtoons.c @@ -454,5 +454,4 @@ const FFCodec ff_cdtoons_decoder = { FF_CODEC_DECODE_CB(cdtoons_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .flush = cdtoons_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 1f25d8eb99..b005442fdc 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -346,5 +346,4 @@ const FFCodec ff_cdxl_decoder = { .close = cdxl_decode_end, FF_CODEC_DECODE_CB(cdxl_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 5adb0b2008..9f218f6384 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -1466,5 +1466,5 @@ const FFCodec ff_cfhd_decoder = { FF_CODEC_DECODE_CB(cfhd_decode), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c index 6b33b29da9..3aad4d060f 100644 --- a/libavcodec/cfhdenc.c +++ b/libavcodec/cfhdenc.c @@ -862,5 +862,5 @@ const FFCodec ff_cfhd_encoder = { AV_PIX_FMT_GBRAP12, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index e69232efb1..4cbbac8e36 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -516,5 +516,4 @@ const FFCodec ff_cinepak_decoder = { .close = cinepak_decode_end, FF_CODEC_DECODE_CB(cinepak_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cinepakenc.c b/libavcodec/cinepakenc.c index 6cfe8de200..95af3cc7ef 100644 --- a/libavcodec/cinepakenc.c +++ b/libavcodec/cinepakenc.c @@ -1225,5 +1225,5 @@ const FFCodec ff_cinepak_encoder = { .close = cinepak_encode_end, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, .p.priv_class = &cinepak_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 075c6e9461..47570a95c2 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -777,5 +777,5 @@ const FFCodec ff_clearvideo_decoder = { .close = clv_decode_end, FF_CODEC_DECODE_CB(clv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c index bb7c9bfb65..21fa8ee019 100644 --- a/libavcodec/cljrdec.c +++ b/libavcodec/cljrdec.c @@ -89,6 +89,5 @@ const FFCodec ff_cljr_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 4866c5b2d4..1b9fdb80f0 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -501,5 +501,4 @@ const FFCodec ff_cllc_decoder = { FF_CODEC_DECODE_CB(cllc_decode_frame), .close = cllc_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c index d549ff4c05..c89dfee033 100644 --- a/libavcodec/cngdec.c +++ b/libavcodec/cngdec.c @@ -175,6 +175,5 @@ const FFCodec ff_comfortnoise_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c index 1f5d25e5b3..98987238dd 100644 --- a/libavcodec/cngenc.c +++ b/libavcodec/cngenc.c @@ -109,5 +109,5 @@ const FFCodec ff_comfortnoise_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index a90c19d61a..3619d04090 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -24,18 +24,13 @@ #include "libavutil/attributes.h" #include "codec.h" -/** - * The codec does not modify any global variables in the init function, - * allowing to call the init function without locking any global mutexes. - */ -#define FF_CODEC_CAP_INIT_THREADSAFE (1 << 0) /** * The codec is not known to be init-threadsafe (i.e. it might be unsafe * to initialize this codec and another codec concurrently, typically because * the codec calls external APIs that are not known to be thread-safe). * Therefore calling the codec's init function needs to be guarded with a lock. */ -#define FF_CODEC_CAP_NOT_INIT_THREADSAFE (1 << 9) +#define FF_CODEC_CAP_NOT_INIT_THREADSAFE (1 << 0) /** * The codec allows calling the close function for deallocation even if * the init function returned a failure. Without this capability flag, a diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 7161209db3..01005d3a50 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1308,5 +1308,5 @@ const FFCodec ff_cook_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c index fcf2621e61..8b8c59f40f 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -232,5 +232,4 @@ const FFCodec ff_cpia_decoder = { .close = cpia_decode_end, FF_CODEC_DECODE_CB(cpia_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 728983797a..2ac04575b7 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -432,6 +432,6 @@ const FFCodec ff_cri_decoder = { FF_CODEC_DECODE_CB(cri_decode_frame), .close = cri_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.long_name = NULL_IF_CONFIG_SMALL("Cintel RAW"), }; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index ea84711299..64d29a942c 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -177,5 +177,5 @@ const FFCodec ff_cscd_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 8fa4d1f3a7..48846b56c2 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -186,7 +186,6 @@ const FFCodec ff_aura_decoder = { .init = cyuv_decode_init, FF_CODEC_DECODE_CB(cyuv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -200,6 +199,5 @@ const FFCodec ff_cyuv_decoder = { .init = cyuv_decode_init, FF_CODEC_DECODE_CB(cyuv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 498e0c86f3..46d3650b25 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -425,5 +425,5 @@ const FFCodec ff_dca_decoder = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &dcadec_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index aad06adb7e..2481c4d3ec 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -1250,7 +1250,7 @@ const FFCodec ff_dca_encoder = { .init = encode_init, .close = encode_close, FF_CODEC_ENCODE_CB(encode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, .p.supported_samplerates = sample_rates, diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 30788f1777..1e3901111c 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -717,5 +717,4 @@ const FFCodec ff_dds_decoder = { FF_CODEC_DECODE_CB(dds_decode), .priv_data_size = sizeof(DDSContext), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE }; diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 057dfffa28..0996bf5a7e 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -431,5 +431,4 @@ const FFCodec ff_dfa_decoder = { .close = dfa_decode_end, FF_CODEC_DECODE_CB(dfa_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index d013d4c215..c036f8e141 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -134,5 +134,4 @@ const FFCodec ff_dfpwm_decoder = { .init = dfpwm_dec_init, FF_CODEC_DECODE_CB(dfpwm_dec_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dfpwmenc.c b/libavcodec/dfpwmenc.c index 85ee1a980a..0465dc23ac 100644 --- a/libavcodec/dfpwmenc.c +++ b/libavcodec/dfpwmenc.c @@ -117,5 +117,4 @@ const FFCodec ff_dfpwm_encoder = { FF_CODEC_ENCODE_CB(dfpwm_enc_frame), .p.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NONE}, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_VARIABLE_FRAME_SIZE, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 50d1d2e1d3..d8fdc27b2c 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -2366,6 +2366,5 @@ const FFCodec ff_dirac_decoder = { .close = dirac_decode_end, FF_CODEC_DECODE_CB(dirac_decode_frame), .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = dirac_decode_flush, }; diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 65cd6d9398..8b6c473c5b 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -736,5 +736,4 @@ const FFCodec ff_dnxhd_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .p.profiles = NULL_IF_CONFIG_SMALL(ff_dnxhd_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 481793c158..7e02ff23d6 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1374,5 +1374,5 @@ const FFCodec ff_dnxhd_encoder = { .p.priv_class = &dnxhd_class, .defaults = dnxhd_defaults, .p.profiles = NULL_IF_CONFIG_SMALL(ff_dnxhd_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index a734af8d45..e6a262403d 100644 --- a/libavcodec/dolby_e.c +++ b/libavcodec/dolby_e.c @@ -1310,5 +1310,5 @@ const FFCodec ff_dolby_e_decoder = { .flush = dolby_e_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index ad020b52f6..e360045ec3 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -419,7 +419,6 @@ const FFCodec ff_ ## name_ ## _decoder = { \ .priv_data_size = sizeof(DPCMContext), \ .init = dpcm_decode_init, \ FF_CODEC_DECODE_CB(dpcm_decode_frame), \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ } DPCM_DECODER(AV_CODEC_ID_DERF_DPCM, derf_dpcm, "DPCM Xilam DERF"); diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 1f2b1b8f5d..c261d05fe2 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -292,5 +292,4 @@ const FFCodec ff_dpx_encoder = { AV_PIX_FMT_GBRP10LE, AV_PIX_FMT_GBRP10BE, AV_PIX_FMT_GBRP12LE, AV_PIX_FMT_GBRP12BE, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index f0e54db100..d724e427bf 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -125,7 +125,6 @@ const FFCodec ff_ ## name_ ## _decoder = { \ .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, \ .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, \ AV_SAMPLE_FMT_NONE }, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ }; DSD_DECODER(DSD_LSBF, dsd_lsbf, "DSD (Direct Stream Digital), least significant bit first") diff --git a/libavcodec/dsicinaudio.c b/libavcodec/dsicinaudio.c index 2cfaebca40..8be4350625 100644 --- a/libavcodec/dsicinaudio.c +++ b/libavcodec/dsicinaudio.c @@ -130,5 +130,4 @@ const FFCodec ff_dsicinaudio_decoder = { .init = cinaudio_decode_init, FF_CODEC_DECODE_CB(cinaudio_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c index 71f6071412..e8d79bfb5d 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -330,6 +330,6 @@ const FFCodec ff_dsicinvideo_decoder = { .init = cinvideo_decode_init, .close = cinvideo_decode_end, FF_CODEC_DECODE_CB(cinvideo_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/dss_sp.c b/libavcodec/dss_sp.c index b465bfe932..d2f71a4450 100644 --- a/libavcodec/dss_sp.c +++ b/libavcodec/dss_sp.c @@ -781,5 +781,4 @@ const FFCodec ff_dss_sp_decoder = { .init = dss_sp_decode_init, FF_CODEC_DECODE_CB(dss_sp_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 93642e34b9..9ad763ab6b 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -390,5 +390,4 @@ const FFCodec ff_dst_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvaudiodec.c b/libavcodec/dvaudiodec.c index 56d9c3573b..d65fc469ff 100644 --- a/libavcodec/dvaudiodec.c +++ b/libavcodec/dvaudiodec.c @@ -127,5 +127,4 @@ const FFCodec ff_dvaudio_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(DVAudioContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 4d4007ffd9..90c062502b 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1579,5 +1579,4 @@ const FFCodec ff_dvbsub_decoder = { .close = dvbsub_close_decoder, FF_CODEC_DECODE_SUB_CB(dvbsub_decode), .p.priv_class = &dvbsubdec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index d6f073058c..4760618a97 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -691,5 +691,4 @@ const FFCodec ff_dvvideo_decoder = { FF_CODEC_DECODE_CB(dvvideo_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 97f366cc74..7fa3363a9c 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -715,5 +715,4 @@ const FFCodec ff_dvdsub_decoder = { FF_CODEC_DECODE_SUB_CB(dvdsub_decode), .flush = dvdsub_flush, .p.priv_class = &dvdsub_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index d29db7d49c..3fe50ae199 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -509,5 +509,4 @@ const FFCodec ff_dvdsub_encoder = { FF_CODEC_ENCODE_SUB_CB(dvdsub_encode), .p.priv_class = &dvdsubenc_class, .priv_data_size = sizeof(DVDSubtitleContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 2922829dc5..f51bd82488 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -1221,5 +1221,4 @@ const FFCodec ff_dvvideo_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &dvvideo_encode_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 93a1724743..fa633cd208 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -371,5 +371,5 @@ const FFCodec ff_dxa_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index d75f8b0402..b3df00a5d8 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -1272,6 +1272,5 @@ const FFCodec ff_dxv_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 79611cee0c..9f8704450a 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -269,6 +269,6 @@ const FFCodec ff_eac3_encoder = { #endif .p.ch_layouts = ff_ac3_ch_layouts, .defaults = ff_ac3_enc_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 0a13a74bb8..b05d0f32a9 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -239,5 +239,5 @@ const FFCodec ff_eacmv_decoder = { .close = cmv_decode_end, FF_CODEC_DECODE_CB(cmv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 337a9c144a..ce74bf0c62 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -350,5 +350,4 @@ const FFCodec ff_eamad_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index 2e9d2fe13c..a28cc521c3 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -255,5 +255,4 @@ const FFCodec ff_eatgq_decoder = { .init = tgq_decode_init, FF_CODEC_DECODE_CB(tgq_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 23cf7300c6..a6af789552 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -368,5 +368,4 @@ const FFCodec ff_eatgv_decoder = { .close = tgv_decode_end, FF_CODEC_DECODE_CB(tgv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 305ea4ba2c..a19202ac1c 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -191,5 +191,4 @@ const FFCodec ff_eatqi_decoder = { .close = tqi_decode_end, FF_CODEC_DECODE_CB(tqi_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 2fdffff13a..170d76f052 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -385,5 +385,4 @@ const FFCodec ff_escape124_decoder = { .close = escape124_decode_close, FF_CODEC_DECODE_CB(escape124_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c index cd6dd7690b..b292343b20 100644 --- a/libavcodec/escape130.c +++ b/libavcodec/escape130.c @@ -355,5 +355,5 @@ const FFCodec ff_escape130_decoder = { .close = escape130_decode_close, FF_CODEC_DECODE_CB(escape130_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index a6475199cd..19e7e58b5f 100644 --- a/libavcodec/evrcdec.c +++ b/libavcodec/evrcdec.c @@ -939,5 +939,4 @@ const FFCodec ff_evrc_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .priv_data_size = sizeof(EVRCContext), .p.priv_class = &evrcdec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 8cd867a32f..b8a6ad78db 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -2351,6 +2351,5 @@ const FFCodec ff_exr_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.priv_class = &exr_class, }; diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c index 8eb138ea01..708404b38f 100644 --- a/libavcodec/exrenc.c +++ b/libavcodec/exrenc.c @@ -557,5 +557,4 @@ const FFCodec ff_exr_encoder = { AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/fastaudio.c b/libavcodec/fastaudio.c index 46fffaf8b8..6093a06900 100644 --- a/libavcodec/fastaudio.c +++ b/libavcodec/fastaudio.c @@ -199,5 +199,4 @@ const FFCodec ff_fastaudio_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 365f8b77a7..8897fd865b 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1064,6 +1064,6 @@ const FFCodec ff_ffv1_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 9849082e44..96da4d0203 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1310,5 +1310,5 @@ const FFCodec ff_ffv1_encoder = { }, .p.priv_class = &ffv1_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c index 67e867b444..04be7761b2 100644 --- a/libavcodec/ffwavesynth.c +++ b/libavcodec/ffwavesynth.c @@ -469,5 +469,5 @@ const FFCodec ff_ffwavesynth_decoder = { .close = wavesynth_close, FF_CODEC_DECODE_CB(wavesynth_decode), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 491f63ea0c..3a0211ebe0 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -495,5 +495,4 @@ const FFCodec ff_fic_decoder = { .close = fic_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, .p.priv_class = &fic_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 87f20c7425..17f1821c50 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -675,5 +675,4 @@ const FFCodec ff_flac_decoder = { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, .p.priv_class = &flac_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index e9edd8476d..9350e42dbc 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1473,5 +1473,5 @@ const FFCodec ff_flac_encoder = { AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, .p.priv_class = &flac_encoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 4357b25d04..8215d04ce8 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -511,7 +511,7 @@ const FFCodec ff_flashsv_decoder = { .close = flashsv_decode_end, FF_CODEC_DECODE_CB(flashsv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, }; #endif /* CONFIG_FLASHSV_DECODER */ @@ -579,7 +579,7 @@ const FFCodec ff_flashsv2_decoder = { .close = flashsv2_decode_end, FF_CODEC_DECODE_CB(flashsv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, }; #endif /* CONFIG_FLASHSV2_DECODER */ diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 07fa9945ff..b2a15fd491 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -920,5 +920,5 @@ const FFCodec ff_flashsv2_encoder = { FF_CODEC_ENCODE_CB(flashsv2_encode_frame), .close = flashsv2_encode_end, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 592bb061cb..12db53bb8f 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -267,5 +267,4 @@ const FFCodec ff_flashsv_encoder = { FF_CODEC_ENCODE_CB(flashsv_encode_frame), .close = flashsv_encode_end, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index b841050a81..50b317d974 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -1114,5 +1114,4 @@ const FFCodec ff_flic_decoder = { .close = flic_decode_end, FF_CODEC_DECODE_CB(flic_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index cc016d129d..a9910482a9 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -123,8 +123,7 @@ const FFCodec ff_flv_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 74ed321e27..453182b109 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -102,7 +102,7 @@ const FFCodec ff_flv_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE}, }; diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c index 4abf6d7048..fe86204b2f 100644 --- a/libavcodec/fmvc.c +++ b/libavcodec/fmvc.c @@ -636,6 +636,5 @@ const FFCodec ff_fmvc_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 7f695305f1..92a1963d12 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -349,5 +349,4 @@ const FFCodec ff_fraps_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index 766fda7455..e6ee0506ac 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -125,5 +125,4 @@ const FFCodec ff_frwu_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.priv_class = &frwu_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 00964369c5..66ccd9a28c 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -1632,5 +1632,5 @@ const FFCodec ff_g2m_decoder = { .close = g2m_decode_end, FF_CODEC_DECODE_CB(g2m_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 8a02ec5230..de2f666a1f 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -149,5 +149,4 @@ const FFCodec ff_adpcm_g722_decoder = { FF_CODEC_DECODE_CB(g722_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.priv_class = &g722_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 325c3927d1..2c0a5019dd 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -388,5 +388,5 @@ const FFCodec ff_adpcm_g722_encoder = { .p.ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index d095f09fe5..257a4e6c30 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -1121,5 +1121,4 @@ const FFCodec ff_g723_1_decoder = { FF_CODEC_DECODE_CB(g723_1_decode_frame), .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, .p.priv_class = &g723_1dec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c index e8fb8429c1..4dc5dcd13a 100644 --- a/libavcodec/g723_1enc.c +++ b/libavcodec/g723_1enc.c @@ -1254,5 +1254,4 @@ const FFCodec ff_g723_1_encoder = { .p.ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 3bf0da3949..6c9406d3fd 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -413,7 +413,6 @@ const FFCodec ff_adpcm_g726_encoder = { AV_SAMPLE_FMT_NONE }, .p.priv_class = &g726_class, .defaults = defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -431,7 +430,6 @@ const FFCodec ff_adpcm_g726le_encoder = { AV_SAMPLE_FMT_NONE }, .p.priv_class = &g726_class, .defaults = defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -512,7 +510,6 @@ const FFCodec ff_adpcm_g726_decoder = { FF_CODEC_DECODE_CB(g726_decode_frame), .flush = g726_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -527,6 +524,5 @@ const FFCodec ff_adpcm_g726le_decoder = { .flush = g726_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index a306456f0a..b678510f34 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -762,7 +762,6 @@ const FFCodec ff_g729_decoder = { FF_CODEC_DECODE_CB(decode_frame), .close = decode_close, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; const FFCodec ff_acelp_kelvin_decoder = { @@ -775,5 +774,4 @@ const FFCodec ff_acelp_kelvin_decoder = { FF_CODEC_DECODE_CB(decode_frame), .close = decode_close, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index 70c2ad4bd1..148204d4f8 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -570,5 +570,4 @@ const FFCodec ff_gdv_decoder = { .close = gdv_decode_close, FF_CODEC_DECODE_CB(gdv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 8c52c865a4..4904f791ef 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -566,5 +566,5 @@ const FFCodec ff_gif_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, .p.priv_class = &gif_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 3936de1cd2..032fb0c66c 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -566,7 +566,6 @@ const FFCodec ff_gif_decoder = { .close = gif_decode_close, FF_CODEC_DECODE_CB(gif_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &decoder_class, }; diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index e5b8d6f41f..dd8d80e07b 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -123,7 +123,6 @@ const FFCodec ff_gsm_decoder = { FF_CODEC_DECODE_CB(gsm_decode_frame), .flush = gsm_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_GSM_MS_DECODER @@ -137,6 +136,5 @@ const FFCodec ff_gsm_ms_decoder = { FF_CODEC_DECODE_CB(gsm_decode_frame), .flush = gsm_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 1699172767..af9ccbbd70 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -690,6 +690,5 @@ const FFCodec ff_h261_decoder = { .close = h261_decode_end, FF_CODEC_DECODE_CB(h261_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.max_lowres = 3, }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 007bb4aa30..a7fb666faa 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -410,7 +410,7 @@ const FFCodec ff_h261_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 1f9f3e5e95..39183c8b27 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -768,8 +768,7 @@ const FFCodec ff_h263_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = ff_mpeg_flush, .p.max_lowres = 3, .p.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, @@ -790,8 +789,7 @@ const FFCodec ff_h263p_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = ff_mpeg_flush, .p.max_lowres = 3, .p.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index d80bc6b17f..30b895a676 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -1098,7 +1098,7 @@ const FFCodec ff_h264_decoder = { #endif NULL }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | + .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, .flush = h264_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_h264_update_thread_context), diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index 0aab1ab87b..beb068830d 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -423,8 +423,7 @@ const FFCodec ff_hap_decoder = { .priv_data_size = sizeof(HapContext), .p.capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .codec_tags = (const uint32_t []){ MKTAG('H','a','p','1'), MKTAG('H','a','p','5'), diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 6a9d4e06cb..3dca25b74d 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -360,6 +360,5 @@ const FFCodec ff_hap_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE, }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c index 7054575872..4c81aa405b 100644 --- a/libavcodec/hcadec.c +++ b/libavcodec/hcadec.c @@ -450,7 +450,7 @@ const FFCodec ff_hca_decoder = { FF_CODEC_DECODE_CB(decode_frame), .close = decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c index 74a13e0044..9fd47b4273 100644 --- a/libavcodec/hcom.c +++ b/libavcodec/hcom.c @@ -144,5 +144,5 @@ const FFCodec ff_hcom_decoder = { .close = hcom_close, FF_CODEC_DECODE_CB(hcom_decode), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f222f20706..2d06d09b75 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3881,7 +3881,7 @@ const FFCodec ff_hevc_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(hevc_update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | + .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, .p.profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), .hw_configs = (const AVCodecHWConfigInternal *const []) { diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index 1326d5f872..db4c877ea4 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -507,5 +507,5 @@ const FFCodec ff_hnm4_video_decoder = { .close = hnm_decode_end, FF_CODEC_DECODE_CB(hnm_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index cea2475bb8..9a07d83114 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -391,6 +391,5 @@ const FFCodec ff_hq_hqa_decoder = { FF_CODEC_DECODE_CB(hq_hqa_decode_frame), .close = hq_hqa_decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c index 596b8a7ed3..c7ba6afc83 100644 --- a/libavcodec/hqx.c +++ b/libavcodec/hqx.c @@ -545,6 +545,5 @@ const FFCodec ff_hqx_decoder = { .close = hqx_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index acc4aafdc2..a9d63acb15 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -1273,7 +1273,7 @@ const FFCodec ff_huffyuv_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_FFVHUFF_DECODER @@ -1288,7 +1288,7 @@ const FFCodec ff_ffvhuff_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif /* CONFIG_FFVHUFF_DECODER */ @@ -1304,6 +1304,6 @@ const FFCodec ff_hymt_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif /* CONFIG_HYMT_DECODER */ diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 195d45c911..a9aa00a5df 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -1064,8 +1064,7 @@ const FFCodec ff_huffyuv_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_FFVHUFF_ENCODER @@ -1097,7 +1096,6 @@ const FFCodec ff_ffvhuff_encoder = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index ecd4ab2fee..1535e6aced 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -251,5 +251,4 @@ const FFCodec ff_idcin_decoder = { FF_CODEC_DECODE_CB(idcin_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .defaults = idcin_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 74ebddc621..cd78352350 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -1916,5 +1916,5 @@ const FFCodec ff_iff_ilbm_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 62a9ad19bf..4c82631c34 100644 --- a/libavcodec/ilbcdec.c +++ b/libavcodec/ilbcdec.c @@ -1487,5 +1487,4 @@ const FFCodec ff_ilbc_decoder = { FF_CODEC_DECODE_CB(ilbc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .priv_data_size = sizeof(ILBCContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 978ea74b74..e9c51a1760 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1095,7 +1095,6 @@ const FFCodec ff_imc_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_IAC_DECODER @@ -1112,6 +1111,5 @@ const FFCodec ff_iac_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index d826818864..fe4e15f381 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -543,6 +543,5 @@ const FFCodec ff_imm4_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/imm5.c b/libavcodec/imm5.c index 9b7ac17aa5..2c85bcc54a 100644 --- a/libavcodec/imm5.c +++ b/libavcodec/imm5.c @@ -187,6 +187,5 @@ const FFCodec ff_imm5_decoder = { .close = imm5_close, .flush = imm5_flush, .priv_data_size = sizeof(IMM5Context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/imx.c b/libavcodec/imx.c index 4ee6006860..4856de0c70 100644 --- a/libavcodec/imx.c +++ b/libavcodec/imx.c @@ -191,6 +191,5 @@ const FFCodec ff_simbiosis_imx_decoder = { .close = imx_decode_close, .flush = imx_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 79028975e5..9bad9bf0b3 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -269,5 +269,4 @@ const FFCodec ff_indeo2_decoder = { .close = ir2_decode_end, FF_CODEC_DECODE_CB(ir2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 43669f46b5..e634cf3dfd 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1143,5 +1143,5 @@ const FFCodec ff_indeo3_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index f0cdff0e2f..b612c88ccf 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -713,5 +713,4 @@ const FFCodec ff_indeo4_decoder = { .close = ff_ivi_decode_close, FF_CODEC_DECODE_CB(ff_ivi_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index aff1102211..1f799fdbc0 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -693,5 +693,5 @@ const FFCodec ff_indeo5_decoder = { .close = ff_ivi_decode_close, FF_CODEC_DECODE_CB(ff_ivi_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index ded0a7f618..9fb1155691 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -140,8 +140,7 @@ const FFCodec ff_h263i_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index 3c482e4c88..3b14919288 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -641,6 +641,6 @@ const FFCodec ff_interplay_acm_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(InterplayACMContext), }; diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index fe2a9e1e6b..75feb8335a 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1366,5 +1366,5 @@ const FFCodec ff_interplay_video_decoder = { .close = ipvideo_decode_end, FF_CODEC_DECODE_CB(ipvideo_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 2fcd001dba..e43cb33ea2 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -903,7 +903,7 @@ const FFCodec ff_h263_encoder = { .p.id = AV_CODEC_ID_H263, .p.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE}, .p.priv_class = &h263_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(MpegEncContext), .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), @@ -934,7 +934,7 @@ const FFCodec ff_h263p_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &h263p_class, .p.capabilities = AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(MpegEncContext), .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index ce77a6d964..20eb336b8d 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1848,5 +1848,5 @@ const FFCodec ff_jpeg2000_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &j2k_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c index e3bf9f4226..8dcc38e651 100644 --- a/libavcodec/jacosubdec.c +++ b/libavcodec/jacosubdec.c @@ -202,5 +202,4 @@ const FFCodec ff_jacosub_decoder = { FF_CODEC_DECODE_SUB_CB(jacosub_decode_frame), .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 92966b11f5..4823127758 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2582,5 +2582,4 @@ const FFCodec ff_jpeg2000_decoder = { .p.priv_class = &jpeg2000_class, .p.max_lowres = 5, .p.profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index ab663dc1fc..984cc3b414 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -560,6 +560,6 @@ const FFCodec ff_jpegls_decoder = { .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, }; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 577e8a19db..ba9355225b 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -489,6 +489,5 @@ const FFCodec ff_jpegls_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 06015ba59d..bca2603330 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -244,5 +244,4 @@ const FFCodec ff_jv_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 08e92c7107..47c2a31b69 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -187,5 +187,4 @@ const FFCodec ff_kgv1_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index a009ba0ce2..d5da5412a0 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -413,5 +413,4 @@ const FFCodec ff_kmvc_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 3aeb1c8a99..f533e1cfbd 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -734,5 +734,4 @@ const FFCodec ff_lagarith_decoder = { .init = lag_decode_init, FF_CODEC_DECODE_CB(lag_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index ffa2fe5a6d..6de55450df 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -640,7 +640,7 @@ const FFCodec ff_mszh_decoder = { .init = decode_init, .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif @@ -655,6 +655,6 @@ const FFCodec ff_zlib_decoder = { .init = decode_init, .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index bd42c155aa..f08cec11f5 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -162,6 +162,5 @@ const FFCodec ff_zlib_encoder = { .close = encode_end, .p.capabilities = AV_CODEC_CAP_FRAME_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 0a46cf2264..1e35743867 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -585,7 +585,7 @@ const FFCodec ff_libdav1d_decoder = { .flush = libdav1d_flush, FF_CODEC_RECEIVE_FRAME_CB(libdav1d_receive_frame), .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_AUTO_THREADS, .p.priv_class = &libdav1d_class, .p.wrapper_name = "libdav1d", diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 11eee51a98..87e412f75c 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -492,7 +492,6 @@ const FFCodec ff_libfdk_aac_decoder = { #endif , .p.priv_class = &fdk_aac_dec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "libfdk", }; diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 7fd0e95233..3a3648f23c 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -335,7 +335,7 @@ const FFCodec ff_libkvazaar_encoder = { FF_CODEC_ENCODE_CB(libkvazaar_encode), .close = libkvazaar_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .p.wrapper_name = "libkvazaar", diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index 007f86b619..04157d8e34 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -166,7 +166,7 @@ const FFCodec ff_libopenh264_decoder = { FF_CODEC_DECODE_CB(svc_decode_frame), .close = svc_decode_close, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_THREADSAFE | + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP, .bsfs = "h264_mp4toannexb", .p.wrapper_name = "libopenh264", diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index db252aace1..54dff6833d 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -461,7 +461,7 @@ const FFCodec ff_libopenh264_encoder = { .init = svc_encode_init, FF_CODEC_ENCODE_CB(svc_encode_frame), .close = svc_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 17fd7ae3e1..e8c1fb2106 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1237,9 +1237,7 @@ FFCodec ff_libx264_encoder = { .p.pix_fmts = pix_fmts_all, #endif .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS -#if X264_BUILD >= 158 - | FF_CODEC_CAP_INIT_THREADSAFE -#else +#if X264_BUILD < 158 | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , @@ -1271,9 +1269,7 @@ const FFCodec ff_libx264rgb_encoder = { .close = X264_close, .defaults = x264_defaults, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS -#if X264_BUILD >= 158 - | FF_CODEC_CAP_INIT_THREADSAFE -#else +#if X264_BUILD < 158 | FF_CODEC_CAP_NOT_INIT_THREADSAFE #endif , diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 4b3dd71bc5..fb08d0991e 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -908,7 +908,6 @@ const FFCodec ff_libxvid_encoder = { .close = xvid_encode_close, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &xvid_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "libxvid", }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index fc7a462734..a167d1780e 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -339,5 +339,4 @@ const FFCodec ff_ljpeg_encoder = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 9cadc9d006..4a37cd6fd8 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -345,5 +345,4 @@ const FFCodec ff_loco_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/lscrdec.c b/libavcodec/lscrdec.c index 9e7010c288..0d6b29cced 100644 --- a/libavcodec/lscrdec.c +++ b/libavcodec/lscrdec.c @@ -255,5 +255,5 @@ const FFCodec ff_lscr_decoder = { .close = lscr_decode_close, FF_CODEC_DECODE_CB(decode_frame_lscr), .flush = lscr_decode_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/m101.c b/libavcodec/m101.c index fce31956c7..16ea6ede32 100644 --- a/libavcodec/m101.c +++ b/libavcodec/m101.c @@ -113,5 +113,4 @@ const FFCodec ff_m101_decoder = { .init = m101_decode_init, FF_CODEC_DECODE_CB(m101_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mace.c b/libavcodec/mace.c index 110b320031..675725a60e 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -295,7 +295,6 @@ const FFCodec ff_mace3_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; const FFCodec ff_mace6_decoder = { @@ -309,5 +308,4 @@ const FFCodec ff_mace6_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 634d45ca48..ae1660eaa3 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -705,5 +705,4 @@ const FFCodec ff_magicyuv_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c index ce492368ef..1be51f3e88 100644 --- a/libavcodec/magicyuvenc.c +++ b/libavcodec/magicyuvenc.c @@ -579,5 +579,5 @@ const FFCodec ff_magicyuv_encoder = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index deabebda62..59bf86b0d7 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -259,5 +259,4 @@ const FFCodec ff_mdec_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 9c5d0369c4..6597563c67 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -385,5 +385,5 @@ const FFCodec ff_metasound_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index bbe78605a9..a6fa6ffa25 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -1239,8 +1239,7 @@ static int mf_init(AVCodecContext *avctx) FF_CODEC_RECEIVE_PACKET_CB(mf_receive_packet), \ FMTS \ CAPS \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | \ - FF_CODEC_CAP_INIT_CLEANUP, \ + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ }; #define AFMTS \ diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c index f36ad51468..b675fc0ea7 100644 --- a/libavcodec/microdvddec.c +++ b/libavcodec/microdvddec.c @@ -377,5 +377,4 @@ const FFCodec ff_microdvd_decoder = { FF_CODEC_DECODE_SUB_CB(microdvd_decode_frame), .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c index a21303ab60..7448c8c797 100644 --- a/libavcodec/midivid.c +++ b/libavcodec/midivid.c @@ -289,5 +289,5 @@ const FFCodec ff_mvdv_decoder = { .flush = decode_flush, .close = decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 74dd947f88..ce5c2afd19 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -449,5 +449,5 @@ const FFCodec ff_mimic_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context), .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS | - FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 8c1809e5fb..2778332e2e 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -167,5 +167,5 @@ const FFCodec ff_mjpegb_decoder = { FF_CODEC_DECODE_CB(mjpegb_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 32874a5a19..816eb1ce5d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -3026,7 +3026,7 @@ const FFCodec ff_mjpeg_decoder = { .p.max_lowres = 3, .p.priv_class = &mjpegdec_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_SETS_PKT_DTS, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_MJPEG_NVDEC_HWACCEL @@ -3052,7 +3052,7 @@ const FFCodec ff_thp_decoder = { .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, }; #endif @@ -3069,7 +3069,7 @@ const FFCodec ff_smvjpeg_decoder = { FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | + .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 27217441a3..63862a5043 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -652,7 +652,7 @@ const FFCodec ff_mjpeg_encoder = { FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = mjpeg_encode_close, .p.capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, @@ -680,7 +680,7 @@ const FFCodec ff_amv_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(amv_encode_picture), .close = mjpeg_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE }, diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index caf35dca0e..8bf7c1586d 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1427,7 +1427,6 @@ const FFCodec ff_mlp_decoder = { FF_CODEC_DECODE_CB(read_access_unit), .flush = mlp_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_TRUEHD_DECODER @@ -1442,6 +1441,5 @@ const FFCodec ff_truehd_decoder = { FF_CODEC_DECODE_CB(read_access_unit), .flush = mlp_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif /* CONFIG_TRUEHD_DECODER */ diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 52ddec3a21..b75151abef 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -2224,7 +2224,7 @@ const FFCodec ff_mlp_encoder = { .p.channel_layouts = ff_mlp_channel_layouts, #endif .p.ch_layouts = ff_mlp_ch_layouts, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_TRUEHD_ENCODER @@ -2249,6 +2249,6 @@ const FFCodec ff_truehd_encoder = { AV_CHANNEL_LAYOUT_5POINT1_BACK, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index fc80ec4764..85e126b17e 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -248,5 +248,4 @@ const FFCodec ff_mmvideo_decoder = { .close = mm_decode_end, FF_CODEC_DECODE_CB(mm_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index dcf788c630..b5ec806e89 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -1351,5 +1351,5 @@ const FFCodec ff_mobiclip_decoder = { .flush = mobiclip_flush, .close = mobiclip_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 29454fd242..8b4f5c1017 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -355,5 +355,5 @@ const FFCodec ff_motionpixels_decoder = { .close = mp_decode_end, FF_CODEC_DECODE_CB(mp_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 70162b4888..42a964951d 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -602,5 +602,4 @@ const FFCodec ff_movtext_decoder = { FF_CODEC_DECODE_SUB_CB(mov_text_decode_frame), .close = mov_text_decode_close, .flush = mov_text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 728338f2cc..9c17ca855a 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -709,5 +709,5 @@ const FFCodec ff_movtext_encoder = { .init = mov_text_encode_init, FF_CODEC_ENCODE_SUB_CB(mov_text_encode_frame), .close = mov_text_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 837507ba5f..5dabc1b5ff 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -322,5 +322,4 @@ const FFCodec ff_mpc7_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 9d084e1664..f9277e6e62 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -395,5 +395,4 @@ const FFCodec ff_mpc8_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e9bde48f7a..0e0bb3d762 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2876,8 +2876,7 @@ const FFCodec ff_mpeg1video_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .p.max_lowres = 3, .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context), @@ -2909,8 +2908,7 @@ const FFCodec ff_mpeg2video_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .p.max_lowres = 3, .p.profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), @@ -2955,8 +2953,7 @@ const FFCodec ff_mpegvideo_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = flush, .p.max_lowres = 3, }; @@ -3116,5 +3113,5 @@ const FFCodec ff_ipu_decoder = { FF_CODEC_DECODE_CB(ipu_decode_frame), .close = ipu_decode_end, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 09d63ff7dc..a7e7aef010 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1231,7 +1231,7 @@ const FFCodec ff_mpeg1video_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &mpeg1_class, }; @@ -1249,7 +1249,7 @@ const FFCodec ff_mpeg2video_encoder = { AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &mpeg2_class, }; #endif /* CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER */ diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 220d415c6f..5591816db5 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3676,8 +3676,7 @@ const FFCodec ff_mpeg4_decoder = { AV_CODEC_CAP_TRUNCATED | #endif AV_CODEC_CAP_DELAY | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = ff_mpeg_flush, .p.max_lowres = 3, diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 8f0452de3a..f1c65f7c2d 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1402,6 +1402,6 @@ const FFCodec ff_mpeg4_encoder = { .close = ff_mpv_encode_end, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &mpeg4enc_class, }; diff --git a/libavcodec/mpegaudiodec_fixed.c b/libavcodec/mpegaudiodec_fixed.c index 8a5721d383..59e1072ffd 100644 --- a/libavcodec/mpegaudiodec_fixed.c +++ b/libavcodec/mpegaudiodec_fixed.c @@ -75,7 +75,6 @@ const FFCodec ff_mp1_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP2_DECODER @@ -93,7 +92,6 @@ const FFCodec ff_mp2_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3_DECODER @@ -111,7 +109,6 @@ const FFCodec ff_mp3_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3ADU_DECODER @@ -129,7 +126,6 @@ const FFCodec ff_mp3adu_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3ON4_DECODER @@ -147,6 +143,6 @@ const FFCodec ff_mp3on4_decoder = { .flush = flush_mp3on4, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index bcd55069a0..1a83f40c19 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -88,7 +88,6 @@ const FFCodec ff_mp1float_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP2FLOAT_DECODER @@ -106,7 +105,6 @@ const FFCodec ff_mp2float_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3FLOAT_DECODER @@ -124,7 +122,6 @@ const FFCodec ff_mp3float_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3ADUFLOAT_DECODER @@ -142,7 +139,6 @@ const FFCodec ff_mp3adufloat_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_MP3ON4FLOAT_DECODER @@ -160,6 +156,6 @@ const FFCodec ff_mp3on4float_decoder = { .flush = flush_mp3on4, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/mpegaudioenc_fixed.c b/libavcodec/mpegaudioenc_fixed.c index 74cb4b8d57..0176011f26 100644 --- a/libavcodec/mpegaudioenc_fixed.c +++ b/libavcodec/mpegaudioenc_fixed.c @@ -45,5 +45,4 @@ const FFCodec ff_mp2fixed_encoder = { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .defaults = mp2_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpegaudioenc_float.c b/libavcodec/mpegaudioenc_float.c index 0a597b7e07..2bcad42e23 100644 --- a/libavcodec/mpegaudioenc_float.c +++ b/libavcodec/mpegaudioenc_float.c @@ -46,5 +46,4 @@ const FFCodec ff_mp2_encoder = { AV_CHANNEL_LAYOUT_STEREO, { 0 } }, .defaults = mp2_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c index 56f008b65c..3645a3a0f6 100644 --- a/libavcodec/mpl2dec.c +++ b/libavcodec/mpl2dec.c @@ -90,5 +90,4 @@ const FFCodec ff_mpl2_decoder = { .init = ff_ass_subtitle_header_default, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mscc.c b/libavcodec/mscc.c index 3666b881a1..f7d33e131c 100644 --- a/libavcodec/mscc.c +++ b/libavcodec/mscc.c @@ -261,7 +261,7 @@ const FFCodec ff_mscc_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_srgc_decoder = { @@ -274,5 +274,5 @@ const FFCodec ff_srgc_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index abebeffc7c..a2b1ab1c9f 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -874,8 +874,7 @@ const FFCodec ff_msmpeg4v1_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -893,8 +892,7 @@ const FFCodec ff_msmpeg4v2_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -912,8 +910,7 @@ const FFCodec ff_msmpeg4v3_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -931,8 +928,7 @@ const FFCodec ff_wmv1_decoder = { .close = ff_h263_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index e597dbbb4e..3bd37d8380 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -683,7 +683,7 @@ const FFCodec ff_msmpeg4v2_encoder = { .p.id = AV_CODEC_ID_MSMPEG4V2, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &ff_mpv_enc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), @@ -697,7 +697,7 @@ const FFCodec ff_msmpeg4v3_encoder = { .p.id = AV_CODEC_ID_MSMPEG4V3, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &ff_mpv_enc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), @@ -711,7 +711,7 @@ const FFCodec ff_wmv1_encoder = { .p.id = AV_CODEC_ID_WMV1, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .p.priv_class = &ff_mpv_enc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(MSMPEG4EncContext), .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index f9d7141c03..72134bc4a6 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -170,5 +170,4 @@ const FFCodec ff_msrle_decoder = { FF_CODEC_DECODE_CB(msrle_decode_frame), .flush = msrle_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index bc00a11abb..d130a8f29c 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -229,5 +229,4 @@ const FFCodec ff_mss1_decoder = { .close = mss1_decode_end, FF_CODEC_DECODE_CB(mss1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 228f66afc0..6019368e07 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -854,5 +854,4 @@ const FFCodec ff_mss2_decoder = { .close = mss2_decode_end, FF_CODEC_DECODE_CB(mss2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index 55d2d10bd6..2e331ac802 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -870,5 +870,5 @@ const FFCodec ff_msa1_decoder = { .close = mss3_decode_end, FF_CODEC_DECODE_CB(mss3_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 9f3c4a593d..d446e78d97 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -615,5 +615,5 @@ const FFCodec ff_mts2_decoder = { .close = mss4_decode_end, FF_CODEC_DECODE_CB(mss4_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index a39f684b52..8db31676f0 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -351,5 +351,4 @@ const FFCodec ff_msvideo1_decoder = { .close = msvideo1_decode_end, FF_CODEC_DECODE_CB(msvideo1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index 53f4a4b365..f14badde21 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -312,5 +312,4 @@ const FFCodec ff_msvideo1_encoder = { FF_CODEC_ENCODE_CB(encode_frame), .close = encode_end, .p.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_RGB555, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c index a32fab2b92..88c360fbd3 100644 --- a/libavcodec/mv30.c +++ b/libavcodec/mv30.c @@ -713,6 +713,5 @@ const FFCodec ff_mv30_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index 4ee8d10ca9..3fa665a5df 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -264,7 +264,6 @@ const FFCodec ff_mvc1_decoder = { .init = mvc_decode_init, FF_CODEC_DECODE_CB(mvc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -278,6 +277,5 @@ const FFCodec ff_mvc2_decoder = { .init = mvc_decode_init, FF_CODEC_DECODE_CB(mvc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index 8a65c42583..097a52eff7 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -308,6 +308,5 @@ const FFCodec ff_mvha_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mwsc.c b/libavcodec/mwsc.c index 499b220a07..d804433cbb 100644 --- a/libavcodec/mwsc.c +++ b/libavcodec/mwsc.c @@ -178,6 +178,5 @@ const FFCodec ff_mwsc_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index e5cdd44fd2..a9f2a2bc2b 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -353,5 +353,5 @@ const FFCodec ff_mxpeg_decoder = { FF_CODEC_DECODE_CB(mxpeg_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 63b60f202c..5c8b23ecb3 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -198,5 +198,4 @@ const FFCodec ff_nellymoser_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index c11dfe504c..5a50ee6a22 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -427,5 +427,5 @@ const FFCodec ff_nellymoser_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }, .p.ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/notchlc.c b/libavcodec/notchlc.c index f6d62b8a4b..7f2bca35f2 100644 --- a/libavcodec/notchlc.c +++ b/libavcodec/notchlc.c @@ -545,5 +545,4 @@ const FFCodec ff_notchlc_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 71420a62f6..3f03775b7f 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -372,5 +372,5 @@ const FFCodec ff_nuv_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/omx.c b/libavcodec/omx.c index d481c0678b..97a2cc0ff1 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -947,7 +947,7 @@ const FFCodec ff_mpeg4_omx_encoder = { .close = omx_encode_end, .p.pix_fmts = omx_encoder_pix_fmts, .p.capabilities = AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &omx_mpeg4enc_class, }; @@ -968,6 +968,6 @@ const FFCodec ff_h264_omx_encoder = { .close = omx_encode_end, .p.pix_fmts = omx_encoder_pix_fmts, .p.capabilities = AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &omx_h264enc_class, }; diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index 5477f6f87b..1fccdc8745 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -1014,7 +1014,7 @@ const FFCodec ff_on2avc_decoder = { FF_CODEC_DECODE_CB(on2avc_decode_frame), .close = on2avc_decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index 8ca99369c6..17a4fc96c1 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -716,5 +716,5 @@ const FFCodec ff_opus_decoder = { FF_CODEC_DECODE_CB(opus_decode_packet), .flush = opus_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index b4b7c472a0..703c802a5c 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -736,7 +736,7 @@ const FFCodec ff_opus_encoder = { .init = opus_encode_init, FF_CODEC_ENCODE_CB(opus_encode_frame), .close = opus_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.capabilities = AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .p.supported_samplerates = (const int []){ 48000, 0 }, #if FF_API_OLD_CHANNEL_LAYOUT diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c index 9f694d2dc8..fc642db2ed 100644 --- a/libavcodec/pafaudio.c +++ b/libavcodec/pafaudio.c @@ -81,5 +81,4 @@ const FFCodec ff_paf_audio_decoder = { .init = paf_audio_init, FF_CODEC_DECODE_CB(paf_audio_decode), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index 60cdd34add..d9fbd19543 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -418,5 +418,5 @@ const FFCodec ff_paf_video_decoder = { .close = paf_video_close, FF_CODEC_DECODE_CB(paf_video_decode), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index 8a94f8a537..df23afe67f 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -141,5 +141,4 @@ const FFCodec ff_pam_encoder = { AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE, AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index a139b54fe0..6a5cdb2dcd 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -310,6 +310,5 @@ const FFCodec ff_pcm_bluray_encoder = { { 0 } }, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.capabilities = AV_CODEC_CAP_DR1, }; diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 57d0ff81d0..0f37c6e08e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -308,5 +308,4 @@ const FFCodec ff_pcm_dvd_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index 6bab1e0aaa..c0b0dea2d4 100644 --- a/libavcodec/pcm-dvdenc.c +++ b/libavcodec/pcm-dvdenc.c @@ -201,5 +201,4 @@ const FFCodec ff_pcm_dvd_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 471075ad71..d097900235 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -564,7 +564,6 @@ const FFCodec ff_ ## name_ ## _encoder = { \ FF_CODEC_ENCODE_CB(pcm_encode_frame), \ .p.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ AV_SAMPLE_FMT_NONE }, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ } #define PCM_ENCODER_2(cf, id, sample_fmt, name, long_name) \ @@ -587,7 +586,6 @@ const FFCodec ff_ ## name_ ## _decoder = { \ .p.capabilities = AV_CODEC_CAP_DR1, \ .p.sample_fmts = (const enum AVSampleFormat[]){ sample_fmt_, \ AV_SAMPLE_FMT_NONE }, \ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \ } #define PCM_DECODER_2(cf, id, sample_fmt, name, long_name) \ diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index e6eb387f0d..8d3178e335 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -205,5 +205,4 @@ const FFCodec ff_pcx_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index e50c6766c5..13c570c3c2 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -700,5 +700,4 @@ const FFCodec ff_pgssub_decoder = { .close = close_decoder, FF_CODEC_DECODE_SUB_CB(decode), .p.priv_class = &pgsdec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c index 0f3001f2e1..239b7a1b54 100644 --- a/libavcodec/photocd.c +++ b/libavcodec/photocd.c @@ -467,5 +467,4 @@ const FFCodec ff_photocd_decoder = { FF_CODEC_DECODE_CB(photocd_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .p.long_name = NULL_IF_CONFIG_SMALL("Kodak Photo CD"), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index 3174f30e91..25f25f6565 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -703,6 +703,5 @@ const FFCodec ff_pixlet_decoder = { .priv_data_size = sizeof(PixletContext), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 87b0c639e3..6e1214401d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1726,7 +1726,7 @@ const FFCodec ff_apng_decoder = { FF_CODEC_DECODE_CB(decode_frame_apng), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif @@ -1743,7 +1743,7 @@ const FFCodec ff_png_decoder = { FF_CODEC_DECODE_CB(decode_frame_png), .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, - .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE | + .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 93463dd341..25cf769931 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1210,7 +1210,6 @@ const FFCodec ff_png_encoder = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }, .p.priv_class = &pngenc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; const FFCodec ff_apng_encoder = { @@ -1232,5 +1231,4 @@ const FFCodec ff_apng_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &pngenc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index f012ed288b..bb2ce53496 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -513,6 +513,5 @@ const FFCodec ff_phm_decoder = { .priv_data_size = sizeof(PNMContext), .init = phm_dec_init, FF_CODEC_DECODE_CB(pnm_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index db40f4b8e2..9de63b400f 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -232,7 +232,6 @@ const FFCodec ff_pgm_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -247,7 +246,6 @@ const FFCodec ff_pgmyuv_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -262,7 +260,6 @@ const FFCodec ff_ppm_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -276,7 +273,6 @@ const FFCodec ff_pbm_encoder = { FF_CODEC_ENCODE_CB(pnm_encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -293,7 +289,6 @@ const FFCodec ff_pfm_encoder = { AV_PIX_FMT_GBRPF32BE, AV_PIX_FMT_GRAYF32BE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -319,6 +314,5 @@ const FFCodec ff_phm_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GRAYF32, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 385ca2fb1c..01e650a650 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -882,7 +882,6 @@ const FFCodec ff_prores_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .p.profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL HWACCEL_VIDEOTOOLBOX(prores), diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 914c3fb2c2..95c0f1c244 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -953,7 +953,7 @@ const FFCodec ff_prores_aw_encoder = { .p.capabilities = AV_CODEC_CAP_FRAME_THREADS, .p.priv_class = &prores_enc_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_prores_encoder = { @@ -969,5 +969,5 @@ const FFCodec ff_prores_encoder = { .p.capabilities = AV_CODEC_CAP_FRAME_THREADS, .p.priv_class = &prores_enc_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 1062ca1443..391072d470 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1409,5 +1409,5 @@ const FFCodec ff_prores_ks_encoder = { }, .p.priv_class = &proresenc_class, .p.profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/prosumer.c b/libavcodec/prosumer.c index 8a91d5e110..c038b9db64 100644 --- a/libavcodec/prosumer.c +++ b/libavcodec/prosumer.c @@ -375,6 +375,5 @@ const FFCodec ff_prosumer_decoder = { FF_CODEC_DECODE_CB(decode_frame), .close = decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 1a4d308ac1..8a46ec5dab 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -799,5 +799,4 @@ const FFCodec ff_qcelp_decoder = { FF_CODEC_DECODE_CB(qcelp_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .priv_data_size = sizeof(QCELPContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 427e8e8449..12db585aa2 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1879,5 +1879,4 @@ const FFCodec ff_qdm2_decoder = { .close = qdm2_decode_close, FF_CODEC_DECODE_CB(qdm2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/qdmc.c b/libavcodec/qdmc.c index f24e94b187..0a66d66441 100644 --- a/libavcodec/qdmc.c +++ b/libavcodec/qdmc.c @@ -739,5 +739,4 @@ const FFCodec ff_qdmc_decoder = { FF_CODEC_DECODE_CB(qdmc_decode_frame), .flush = qdmc_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/qoienc.c b/libavcodec/qoienc.c index bd137674a4..3f043872c5 100644 --- a/libavcodec/qoienc.c +++ b/libavcodec/qoienc.c @@ -136,5 +136,4 @@ const FFCodec ff_qoi_encoder = { AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 9e787cb434..ea92b693cd 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -362,6 +362,5 @@ const FFCodec ff_qpeg_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 5e2139cce9..2c070c0bc2 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -592,5 +592,4 @@ const FFCodec ff_qtrle_decoder = { FF_CODEC_DECODE_CB(qtrle_decode_frame), .flush = qtrle_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 21c19eda23..e0b1ecb9eb 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -411,5 +411,5 @@ const FFCodec ff_qtrle_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB555BE, AV_PIX_FMT_ARGB, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index b95f663aa5..5ac285f286 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -111,7 +111,6 @@ const FFCodec ff_r210_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_R10K_DECODER @@ -123,7 +122,6 @@ const FFCodec ff_r10k_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_AVRP_DECODER @@ -135,6 +133,5 @@ const FFCodec ff_avrp_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index cfff21cb23..dca6fa7197 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -100,7 +100,6 @@ const FFCodec ff_r210_encoder = { .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = pix_fmt, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_R10K_ENCODER @@ -113,7 +112,6 @@ const FFCodec ff_r10k_encoder = { .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = pix_fmt, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_AVRP_ENCODER @@ -126,6 +124,5 @@ const FFCodec ff_avrp_encoder = { .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = pix_fmt, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index bef6389bcf..a56d4f7d51 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -135,5 +135,4 @@ const FFCodec ff_ra_144_decoder = { .init = ra144_decode_init, FF_CODEC_DECODE_CB(ra144_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 66ac381e60..1608b9463e 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -553,5 +553,4 @@ const FFCodec ff_ra_144_encoder = { .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, 0 }, #endif .p.ch_layouts = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 24d976fd92..4b2cc188b4 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -246,5 +246,4 @@ const FFCodec ff_ra_288_decoder = { .init = ra288_decode_init, FF_CODEC_DECODE_CB(ra288_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index 16cb524a4e..ff4556b707 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -527,5 +527,5 @@ const FFCodec ff_ralf_decoder = { AV_CODEC_CAP_DR1, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c index bcb619f11c..805e29338d 100644 --- a/libavcodec/rasc.c +++ b/libavcodec/rasc.c @@ -808,7 +808,6 @@ const FFCodec ff_rasc_decoder = { FF_CODEC_DECODE_CB(decode_frame), .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &rasc_decoder_class, }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index c10b20d4f9..34e49c26ca 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -491,5 +491,4 @@ const FFCodec ff_rawvideo_decoder = { FF_CODEC_DECODE_CB(raw_decode), .p.priv_class = &rawdec_class, .p.capabilities = AV_CODEC_CAP_PARAM_CHANGE, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index 34d7a1bef4..826102efaf 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -89,5 +89,4 @@ const FFCodec ff_rawvideo_encoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .init = raw_encode_init, FF_CODEC_ENCODE_CB(raw_encode), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c index c3e138a7ba..f78c8229fe 100644 --- a/libavcodec/realtextdec.c +++ b/libavcodec/realtextdec.c @@ -83,5 +83,4 @@ const FFCodec ff_realtext_decoder = { .init = ff_ass_subtitle_header_default, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index e76b068970..fc022ff43e 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -227,5 +227,4 @@ const FFCodec ff_rl2_decoder = { .close = rl2_decode_end, FF_CODEC_DECODE_CB(rl2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index 18a5f23df0..e5bc902133 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -199,5 +199,4 @@ const FFCodec ff_roq_dpcm_encoder = { .close = roq_dpcm_encode_close, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 3e796b18bc..4fbb0ca94d 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -243,5 +243,5 @@ const FFCodec ff_roq_decoder = { .close = roq_decode_end, FF_CODEC_DECODE_CB(roq_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index c0c67dbed9..ebbcb2128b 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1130,5 +1130,5 @@ const FFCodec ff_roq_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, .p.priv_class = &roq_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 703f05e7b8..d5ece16c32 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -296,5 +296,4 @@ const FFCodec ff_rpza_decoder = { .close = rpza_decode_end, FF_CODEC_DECODE_CB(rpza_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c index 50b68bb8b3..f01103fe11 100644 --- a/libavcodec/rpzaenc.c +++ b/libavcodec/rpzaenc.c @@ -853,7 +853,6 @@ const FFCodec ff_rpza_encoder = { .init = rpza_encode_init, FF_CODEC_ENCODE_CB(rpza_encode_frame), .close = rpza_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB555, AV_PIX_FMT_NONE}, }; diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index f4fa786718..eff4f87750 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -372,6 +372,5 @@ const FFCodec ff_rscc_decoder = { .close = rscc_close, .priv_data_size = sizeof(RsccContext), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index e394a63a2b..23947201a4 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -691,7 +691,6 @@ const FFCodec ff_rv10_decoder = { .close = rv10_decode_end, FF_CODEC_DECODE_CB(rv10_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -709,7 +708,6 @@ const FFCodec ff_rv20_decoder = { .close = rv10_decode_end, FF_CODEC_DECODE_CB(rv10_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = ff_mpeg_flush, .p.max_lowres = 3, .p.pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 7560e6026a..71cbb8d249 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -75,6 +75,6 @@ const FFCodec ff_rv10_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 422188e21a..8978f3f8e5 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -72,6 +72,6 @@ const FFCodec ff_rv20_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 8fd8498d9a..a06e928a64 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -308,6 +308,5 @@ const FFCodec ff_rv30_decoder = { AV_PIX_FMT_NONE }, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index b9469819f7..1ddc04ebb3 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -591,6 +591,5 @@ const FFCodec ff_rv40_decoder = { AV_PIX_FMT_NONE }, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index b6f9501bf2..123ce1302c 100644 --- a/libavcodec/s302menc.c +++ b/libavcodec/s302menc.c @@ -189,5 +189,4 @@ const FFCodec ff_s302m_encoder = { AV_CH_LAYOUT_5POINT1_BACK, AV_CH_LAYOUT_5POINT1_BACK | AV_CH_LAYOUT_STEREO_DOWNMIX, 0 }, */ - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c index cf5dec955b..d3d77cb548 100644 --- a/libavcodec/samidec.c +++ b/libavcodec/samidec.c @@ -190,5 +190,4 @@ const FFCodec ff_sami_decoder = { .close = sami_close, FF_CODEC_DECODE_SUB_CB(sami_decode_frame), .flush = sami_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 7f094c8bbf..775768b7a0 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1526,5 +1526,4 @@ const FFCodec ff_sanm_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c index 99af7e1652..b7e59d7124 100644 --- a/libavcodec/sbcdec.c +++ b/libavcodec/sbcdec.c @@ -374,7 +374,6 @@ const FFCodec ff_sbc_decoder = { .init = sbc_decode_init, FF_CODEC_DECODE_CB(sbc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0}, diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index 18ac4fb9bd..863899c524 100644 --- a/libavcodec/sbcenc.c +++ b/libavcodec/sbcenc.c @@ -352,7 +352,6 @@ const FFCodec ff_sbc_encoder = { .priv_data_size = sizeof(SBCEncContext), .init = sbc_encode_init, FF_CODEC_ENCODE_CB(sbc_encode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0}, diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 0623b73c84..ed129a507d 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -677,6 +677,5 @@ const FFCodec ff_scpr_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index 8a4a8cde9e..f5bc46ff99 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -193,6 +193,5 @@ const FFCodec ff_screenpresso_decoder = { .close = screenpresso_close, .priv_data_size = sizeof(ScreenpressoContext), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/sga.c b/libavcodec/sga.c index cdd37feb70..27918ee2b3 100644 --- a/libavcodec/sga.c +++ b/libavcodec/sga.c @@ -529,5 +529,4 @@ const FFCodec ff_sga_decoder = { FF_CODEC_DECODE_CB(sga_decode_frame), .close = sga_decode_end, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index b23e205c3b..965461de5f 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -295,5 +295,4 @@ const FFCodec ff_sgi_decoder = { FF_CODEC_DECODE_CB(decode_frame), .init = sgi_decode_init, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 93cb95f07f..5d2cc7e3b9 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -286,5 +286,4 @@ const FFCodec ff_sgi_encoder = { AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index e04b9b1cad..a9fd24c406 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -139,5 +139,4 @@ const FFCodec ff_sgirle_decoder = { .init = sgirle_decode_init, FF_CODEC_DECODE_CB(sgirle_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 27074e930d..39aa1475bd 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -819,5 +819,4 @@ const FFCodec ff_shorten_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 9d11f2c5c6..bf8d627e16 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -571,5 +571,4 @@ const FFCodec ff_sipr_decoder = { .init = sipr_decoder_init, FF_CODEC_DECODE_CB(sipr_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/siren.c b/libavcodec/siren.c index b613ee113d..e7a5a33553 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -853,8 +853,7 @@ const FFCodec ff_siren_decoder = { .flush = siren_flush, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_msnsiren_decoder = { @@ -869,6 +868,5 @@ const FFCodec ff_msnsiren_decoder = { .flush = siren_flush, .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 9d02968d64..06af0fb7b6 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -752,7 +752,7 @@ const FFCodec ff_smacker_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_smackaud_decoder = { @@ -763,5 +763,4 @@ const FFCodec ff_smackaud_decoder = { .init = smka_decode_init, FF_CODEC_DECODE_CB(smka_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 313d8edba6..28dc2b4d3c 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -478,5 +478,4 @@ const FFCodec ff_smc_decoder = { .close = smc_decode_end, FF_CODEC_DECODE_CB(smc_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c index e1137098d0..0b7b030ebe 100644 --- a/libavcodec/smcenc.c +++ b/libavcodec/smcenc.c @@ -557,7 +557,6 @@ const FFCodec ff_smc_encoder = { .init = smc_encode_init, FF_CODEC_ENCODE_CB(smc_encode_frame), .close = smc_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE}, }; diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 92ff87731c..3a7fda09eb 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -663,6 +663,5 @@ const FFCodec ff_snow_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 207948675b..9605c9567c 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1927,6 +1927,5 @@ const FFCodec ff_snow_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &snowenc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index dfb055d80e..c635831358 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1086,7 +1086,7 @@ const FFCodec ff_sonic_decoder = { .close = sonic_decode_close, FF_CODEC_DECODE_CB(sonic_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif /* CONFIG_SONIC_DECODER */ @@ -1101,7 +1101,7 @@ const FFCodec ff_sonic_encoder = { FF_CODEC_ENCODE_CB(sonic_encode_frame), .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_EXPERIMENTAL, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; #endif @@ -1117,7 +1117,7 @@ const FFCodec ff_sonic_ls_encoder = { FF_CODEC_ENCODE_CB(sonic_encode_frame), .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .p.capabilities = AV_CODEC_CAP_EXPERIMENTAL, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; #endif diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index aa4d3d771b..1d8316f64c 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -103,7 +103,7 @@ const FFCodec ff_sp5x_decoder = { FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, }; #endif @@ -119,7 +119,7 @@ const FFCodec ff_amv_decoder = { FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), .p.max_lowres = 3, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, }; #endif diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 4cfd4ce73d..c43de4f199 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -733,6 +733,5 @@ const FFCodec ff_speedhq_decoder = { .init = speedhq_decode_init, FF_CODEC_DECODE_CB(speedhq_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif /* CONFIG_SPEEDHQ_DECODER */ diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 7a53d86945..73c70c269a 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -287,7 +287,7 @@ const FFCodec ff_speedhq_encoder = { .init = ff_mpv_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 3251eda820..92a4f392a7 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1586,5 +1586,5 @@ const FFCodec ff_speex_decoder = { .close = speex_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .priv_data_size = sizeof(SpeexContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index b2df34474e..3a1ddfc88b 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -99,7 +99,6 @@ const FFCodec ff_srt_decoder = { FF_CODEC_DECODE_SUB_CB(srt_decode_frame), .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -113,6 +112,5 @@ const FFCodec ff_subrip_decoder = { FF_CODEC_DECODE_SUB_CB(srt_decode_frame), .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 51456c8b9d..f6b2f16048 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -302,7 +302,6 @@ const FFCodec ff_srt_encoder = { .init = srt_encode_init, FF_CODEC_ENCODE_SUB_CB(srt_encode_frame), .close = srt_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -316,7 +315,6 @@ const FFCodec ff_subrip_encoder = { .init = srt_encode_init, FF_CODEC_ENCODE_SUB_CB(srt_encode_frame), .close = srt_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -330,6 +328,5 @@ const FFCodec ff_text_encoder = { .init = srt_encode_init, FF_CODEC_ENCODE_SUB_CB(text_encode_frame), .close = srt_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c index 2bda5fa5c1..3a293b0a34 100644 --- a/libavcodec/subviewerdec.c +++ b/libavcodec/subviewerdec.c @@ -74,5 +74,4 @@ const FFCodec ff_subviewer_decoder = { .init = ff_ass_subtitle_header_default, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index 6245e592c7..4fcc0e3309 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -222,5 +222,4 @@ const FFCodec ff_sunrast_encoder = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 6fb50575bf..27feac354c 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -856,5 +856,4 @@ const FFCodec ff_svq1_decoder = { .flush = svq1_flush, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 3c2d594632..37a111a1ec 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -689,5 +689,5 @@ const FFCodec ff_svq1_encoder = { .close = svq1_encode_end, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index f038466922..1c3ed3c2fd 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1602,5 +1602,5 @@ const FFCodec ff_svq3_decoder = { AV_CODEC_CAP_DELAY, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE}, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 47978fcd4b..3e53401328 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -956,5 +956,4 @@ const FFCodec ff_tak_decoder = { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/targa_y216dec.c b/libavcodec/targa_y216dec.c index bf33dc8a68..1c19857547 100644 --- a/libavcodec/targa_y216dec.c +++ b/libavcodec/targa_y216dec.c @@ -81,5 +81,4 @@ const FFCodec ff_targa_y216_decoder = { .init = y216_decode_init, FF_CODEC_DECODE_CB(y216_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 84e2086869..f439ba0dc6 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -215,5 +215,4 @@ const FFCodec ff_targa_encoder = { AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB555LE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c index 0cf17d75dd..7e16a32093 100644 --- a/libavcodec/tdsc.c +++ b/libavcodec/tdsc.c @@ -631,6 +631,5 @@ const FFCodec ff_tdsc_decoder = { .close = tdsc_close, .priv_data_size = sizeof(TDSCContext), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index d509452391..4856ecdde3 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -90,7 +90,6 @@ const FFCodec ff_text_decoder = { .init = ff_ass_subtitle_header_default, .p.priv_class = &textsub_decoder_class, .flush = text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -114,7 +113,6 @@ const FFCodec ff_vplayer_decoder = { .init = linebreak_init, .p.priv_class = &textsub_decoder_class, .flush = text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -129,7 +127,6 @@ const FFCodec ff_stl_decoder = { .init = linebreak_init, .p.priv_class = &textsub_decoder_class, .flush = text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -144,7 +141,6 @@ const FFCodec ff_pjs_decoder = { .init = linebreak_init, .p.priv_class = &textsub_decoder_class, .flush = text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -159,7 +155,6 @@ const FFCodec ff_subviewer1_decoder = { .init = linebreak_init, .p.priv_class = &textsub_decoder_class, .flush = text_flush, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 618275a57c..26711a3bc4 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -271,5 +271,4 @@ const FFCodec ff_tiertexseqvideo_decoder = { .close = seqvideo_decode_end, FF_CODEC_DECODE_CB(seqvideo_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index e4a5d3c537..6a3f98a1a5 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2187,6 +2187,6 @@ const FFCodec ff_tiff_decoder = { .close = tiff_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.priv_class = &tiff_decoder_class, }; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 2f2742e566..7228f66e2d 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -589,5 +589,4 @@ const FFCodec ff_tiff_encoder = { AV_PIX_FMT_NONE }, .p.priv_class = &tiffenc_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index d1685a0ae7..22329f2db0 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -94,5 +94,4 @@ const FFCodec ff_tmv_decoder = { .init = tmv_decode_init, FF_CODEC_DECODE_CB(tmv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 64d9b8fed1..fc9f8118be 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -920,5 +920,5 @@ const FFCodec ff_truemotion1_decoder = { .close = truemotion1_decode_end, FF_CODEC_DECODE_CB(truemotion1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 3fd956ee1e..ec3f0d0d08 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -1018,5 +1018,5 @@ const FFCodec ff_truemotion2_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/truemotion2rt.c b/libavcodec/truemotion2rt.c index a3686fc1ac..46452a772b 100644 --- a/libavcodec/truemotion2rt.c +++ b/libavcodec/truemotion2rt.c @@ -228,5 +228,4 @@ const FFCodec ff_truemotion2rt_decoder = { .init = truemotion2rt_decode_init, FF_CODEC_DECODE_CB(truemotion2rt_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index e472cb8241..f0cfada11c 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -365,5 +365,4 @@ const FFCodec ff_truespeech_decoder = { .init = truespeech_decode_init, FF_CODEC_DECODE_CB(truespeech_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 7343d7aace..601ee198b1 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -180,5 +180,5 @@ const FFCodec ff_tscc_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index f6950fbbb6..a50a8da738 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.c @@ -366,5 +366,5 @@ const FFCodec ff_tscc2_decoder = { .close = tscc2_decode_end, FF_CODEC_DECODE_CB(tscc2_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 74be140d51..4bc6016977 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -431,5 +431,5 @@ const FFCodec ff_tta_decoder = { FF_CODEC_DECODE_CB(tta_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_CHANNEL_CONF, .p.priv_class = &tta_decoder_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index b7d4aafdc3..25113d4a72 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -216,5 +216,4 @@ const FFCodec ff_tta_encoder = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index be1d8fb2e8..2a0be99028 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -392,5 +392,5 @@ const FFCodec ff_ttml_encoder = { .init = ttml_encode_init, FF_CODEC_ENCODE_SUB_CB(ttml_encode_frame), .close = ttml_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c index 6dfa57f007..7732957850 100644 --- a/libavcodec/twinvqdec.c +++ b/libavcodec/twinvqdec.c @@ -426,5 +426,5 @@ const FFCodec ff_twinvq_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index a8bec9cce2..b9d17da60e 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -428,5 +428,4 @@ const FFCodec ff_ulti_decoder = { .close = ulti_decode_end, FF_CODEC_DECODE_CB(ulti_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 03ee8f0b10..fd16c3f59b 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -1060,5 +1060,4 @@ const FFCodec ff_utvideo_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 15a53a6094..2c1189ed07 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -658,5 +658,5 @@ const FFCodec ff_utvideo_encoder = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index bf84cd4428..f5463799c4 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -243,5 +243,4 @@ const FFCodec ff_v210_decoder = { AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .p.priv_class = &v210dec_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index de2e405efc..f466df8c60 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -117,5 +117,4 @@ const FFCodec ff_v210_encoder = { .init = encode_init, FF_CODEC_ENCODE_CB(encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 18d3e637be..f388a1cf9a 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -127,5 +127,4 @@ const FFCodec ff_v210x_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index 5f8cbc634b..a6a699cab7 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -80,5 +80,4 @@ const FFCodec ff_v308_decoder = { .init = v308_decode_init, FF_CODEC_DECODE_CB(v308_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c index c4f07a123d..bd73b2e95a 100644 --- a/libavcodec/v308enc.c +++ b/libavcodec/v308enc.c @@ -79,5 +79,4 @@ const FFCodec ff_v308_encoder = { .init = v308_encode_init, FF_CODEC_ENCODE_CB(v308_encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 02024959c7..88fa777f22 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -90,7 +90,6 @@ const FFCodec ff_ayuv_decoder = { .init = v408_decode_init, FF_CODEC_DECODE_CB(v408_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_V408_DECODER @@ -102,6 +101,5 @@ const FFCodec ff_v408_decoder = { .init = v408_decode_init, FF_CODEC_DECODE_CB(v408_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 157ed85104..c53fa4e2a4 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -89,7 +89,6 @@ const FFCodec ff_ayuv_encoder = { .init = v408_encode_init, FF_CODEC_ENCODE_CB(v408_encode_frame), .p.pix_fmts = pix_fmt, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_V408_ENCODER @@ -102,6 +101,5 @@ const FFCodec ff_v408_encoder = { .init = v408_encode_init, FF_CODEC_ENCODE_CB(v408_encode_frame), .p.pix_fmts = pix_fmt, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index e67cb820ba..4844e123d9 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -123,5 +123,4 @@ const FFCodec ff_v410_decoder = { FF_CODEC_DECODE_CB(v410_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 88a2ce346b..a78402c054 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -83,5 +83,4 @@ const FFCodec ff_v410_encoder = { .init = v410_encode_init, FF_CODEC_ENCODE_CB(v410_encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P10, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vb.c b/libavcodec/vb.c index 82b4ea85ca..0bd2cb6185 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -288,5 +288,5 @@ const FFCodec ff_vb_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vble.c b/libavcodec/vble.c index f7ab17d621..48a0c1371b 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -211,5 +211,4 @@ const FFCodec ff_vble_decoder = { .close = vble_decode_close, FF_CODEC_DECODE_CB(vble_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vbndec.c b/libavcodec/vbndec.c index a6046c766a..8be625c89e 100644 --- a/libavcodec/vbndec.c +++ b/libavcodec/vbndec.c @@ -182,5 +182,4 @@ const FFCodec ff_vbn_decoder = { FF_CODEC_DECODE_CB(vbn_decode_frame), .priv_data_size = sizeof(VBNContext), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE }; diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index de35a44d3f..ea33005114 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -161,6 +161,5 @@ const FFCodec ff_vbn_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE, }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index a7d556c378..5c5b31ad32 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1212,7 +1212,6 @@ const FFCodec ff_vc1_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .flush = ff_mpeg_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_VC1_DXVA2_HWACCEL @@ -1250,7 +1249,6 @@ const FFCodec ff_wmv3_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .flush = ff_mpeg_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .p.pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_WMV3_DXVA2_HWACCEL @@ -1288,7 +1286,6 @@ const FFCodec ff_wmv3image_decoder = { .close = ff_vc1_decode_end, FF_CODEC_DECODE_CB(vc1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = vc1_sprite_flush, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, @@ -1308,7 +1305,6 @@ const FFCodec ff_vc1image_decoder = { .close = ff_vc1_decode_end, FF_CODEC_DECODE_CB(vc1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = vc1_sprite_flush, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 1e3127f080..f776d25b91 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1230,7 +1230,7 @@ const FFCodec ff_vc2_encoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_DIRAC, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(VC2EncContext), .init = vc2_encode_init, .close = vc2_encode_end, diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 4aed1eeafb..b149c9f162 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -130,5 +130,4 @@ const FFCodec ff_vcr1_decoder = { .init = vcr1_decode_init, FF_CODEC_DECODE_CB(vcr1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 69d9fe75bf..823e5ad94e 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2750,8 +2750,7 @@ const FFCodec ff_h264_videotoolbox_encoder = { FF_CODEC_ENCODE_CB(vtenc_frame), .close = vtenc_close, .p.priv_class = &h264_videotoolbox_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; static const AVOption hevc_options[] = { @@ -2785,8 +2784,7 @@ const FFCodec ff_hevc_videotoolbox_encoder = { FF_CODEC_ENCODE_CB(vtenc_frame), .close = vtenc_close, .p.priv_class = &hevc_videotoolbox_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "videotoolbox", }; @@ -2824,7 +2822,6 @@ const FFCodec ff_prores_videotoolbox_encoder = { FF_CODEC_ENCODE_CB(vtenc_frame), .close = vtenc_close, .p.priv_class = &prores_videotoolbox_class, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.wrapper_name = "videotoolbox", }; diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 73276056c2..9a7726168b 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -215,5 +215,4 @@ const FFCodec ff_adpcm_vima_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c index 2e6e358b64..e54e341f90 100644 --- a/libavcodec/vmdaudio.c +++ b/libavcodec/vmdaudio.c @@ -237,5 +237,4 @@ const FFCodec ff_vmdaudio_decoder = { .init = vmdaudio_decode_init, FF_CODEC_DECODE_CB(vmdaudio_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index 947f09b73b..131e013a94 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -474,5 +474,5 @@ const FFCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, FF_CODEC_DECODE_CB(vmdvideo_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index cc790984ad..e6e5442a16 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -583,5 +583,4 @@ const FFCodec ff_vmnc_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 6ba0e1d811..b94b4a34e0 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1895,7 +1895,7 @@ const FFCodec ff_vorbis_decoder = { FF_CODEC_DECODE_CB(vorbis_decode_frame), .flush = vorbis_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, #if FF_API_OLD_CHANNEL_LAYOUT .p.channel_layouts = ff_vorbis_channel_layouts, #endif diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 0db8aeb2b5..c8bbbf02d8 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1307,5 +1307,5 @@ const FFCodec ff_vorbis_encoder = { .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_EXPERIMENTAL, .p.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 8ca1b0dfe3..53fc514788 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -3181,7 +3181,7 @@ const FFCodec ff_theora_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif @@ -3199,7 +3199,7 @@ const FFCodec ff_vp3_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; @@ -3217,7 +3217,7 @@ const FFCodec ff_vp4_decoder = { AV_CODEC_CAP_FRAME_THREADS, .flush = vp3_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 7ec381b5e5..de8846a867 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -313,5 +313,5 @@ const FFCodec ff_vp5_decoder = { .close = vp56_free, FF_CODEC_DECODE_CB(ff_vp56_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 19dc754fee..37938038c4 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -722,7 +722,7 @@ const FFCodec ff_vp6_decoder = { .close = vp6_decode_free, FF_CODEC_DECODE_CB(ff_vp56_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down */ @@ -736,7 +736,7 @@ const FFCodec ff_vp6f_decoder = { .close = vp6_decode_free, FF_CODEC_DECODE_CB(ff_vp56_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; /* flash version, not flipped upside-down, with alpha channel */ @@ -750,5 +750,5 @@ const FFCodec ff_vp6a_decoder = { .close = vp6_decode_free, FF_CODEC_DECODE_CB(ff_vp56_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index f521f2c9de..10de962118 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2949,7 +2949,6 @@ const FFCodec ff_vp7_decoder = { .close = ff_vp8_decode_free, FF_CODEC_DECODE_CB(vp7_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .flush = vp8_decode_flush, }; #endif /* CONFIG_VP7_DECODER */ @@ -2966,8 +2965,7 @@ const FFCodec ff_vp8_decoder = { FF_CODEC_DECODE_CB(ff_vp8_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp8_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), .hw_configs = (const AVCodecHWConfigInternal *const []) { diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fee79fb45b..12ec87992c 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1876,7 +1876,7 @@ const FFCodec ff_vp9_decoder = { .close = vp9_decode_free, FF_CODEC_DECODE_CB(vp9_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SLICE_THREAD_HAS_MF | FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp9_decode_flush, diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 62f930ed94..a195eae584 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -857,5 +857,5 @@ const FFCodec ff_vqa_decoder = { FF_CODEC_DECODE_CB(vqa_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .defaults = vqa_defaults, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 8bfbb654e8..0e8d1286c2 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1714,6 +1714,6 @@ const FFCodec ff_wavpack_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index 1f95768c09..7f7ed804ee 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -2977,5 +2977,4 @@ const FFCodec ff_wavpack_encoder = { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c index ac135f6859..d2fdb30662 100644 --- a/libavcodec/wcmv.c +++ b/libavcodec/wcmv.c @@ -250,6 +250,5 @@ const FFCodec ff_wcmv_decoder = { .close = decode_close, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/webp.c b/libavcodec/webp.c index e57a5a2917..bbc10ba2df 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1565,5 +1565,4 @@ const FFCodec ff_webp_decoder = { FF_CODEC_DECODE_CB(webp_decode_frame), .close = webp_decode_close, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index fcf1062d86..e245e83ad3 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -107,5 +107,4 @@ const FFCodec ff_webvtt_decoder = { .init = ff_ass_subtitle_header_default, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index e433bb4579..f47a5c51d4 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -220,5 +220,4 @@ const FFCodec ff_webvtt_encoder = { .init = webvtt_encode_init, FF_CODEC_ENCODE_SUB_CB(webvtt_encode_frame), .close = webvtt_encode_close, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 825bd6cdbb..755fd39521 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -1012,7 +1012,7 @@ const FFCodec ff_wmav1_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_DECODER @@ -1029,6 +1029,6 @@ const FFCodec ff_wmav2_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 28a7546eb5..02572d6796 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -444,7 +444,7 @@ const FFCodec ff_wmav1_encoder = { .close = ff_wma_end, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_ENCODER @@ -459,6 +459,6 @@ const FFCodec ff_wmav2_encoder = { .close = ff_wma_end, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 16c6713cd4..614b6135f5 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1338,7 +1338,7 @@ const FFCodec ff_wmalossless_decoder = { FF_CODEC_DECODE_CB(decode_packet), .flush = flush, .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 9cf763acd4..136522bbf6 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -2093,7 +2093,7 @@ const FFCodec ff_wmapro_decoder = { .flush = wmapro_flush, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_xma1_decoder = { @@ -2108,7 +2108,7 @@ const FFCodec ff_xma1_decoder = { .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; const FFCodec ff_xma2_decoder = { @@ -2124,5 +2124,5 @@ const FFCodec ff_xma2_decoder = { .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index c52ab876b2..6f6cc949f9 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2008,6 +2008,6 @@ const FFCodec ff_wmavoice_decoder = { .close = wmavoice_decode_end, FF_CODEC_DECODE_CB(wmavoice_decode_packet), .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .flush = wmavoice_flush, }; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index bf0e609c0b..e61b549439 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -601,7 +601,7 @@ const FFCodec ff_wmv2_decoder = { .close = wmv2_decode_end, FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 88211ac179..2f6c688b2a 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -243,7 +243,7 @@ const FFCodec ff_wmv2_encoder = { .init = wmv2_encode_init, FF_CODEC_ENCODE_CB(ff_mpv_encode_picture), .close = ff_mpv_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 0cf2181a48..0f62fd311d 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -140,5 +140,4 @@ const FFCodec ff_wnv1_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index 06c274eed0..4e4fd06816 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -108,7 +108,6 @@ const FFCodec ff_wrapped_avframe_encoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WRAPPED_AVFRAME, FF_CODEC_ENCODE_CB(wrapped_avframe_encode), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; const FFCodec ff_wrapped_avframe_decoder = { @@ -117,5 +116,4 @@ const FFCodec ff_wrapped_avframe_decoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_WRAPPED_AVFRAME, FF_CODEC_DECODE_CB(wrapped_avframe_decode), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 8d072297ee..ceda57597f 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -178,5 +178,4 @@ const FFCodec ff_ws_snd1_decoder = { .init = ws_snd_decode_init, FF_CODEC_DECODE_CB(ws_snd_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 3386a702b1..cdc302f6d1 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -644,5 +644,5 @@ const FFCodec ff_xan_wc3_decoder = { .close = xan_decode_end, FF_CODEC_DECODE_CB(xan_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index f15bc2d773..880a62c976 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -185,5 +185,4 @@ const FFCodec ff_xface_decoder = { .init = xface_decode_init, FF_CODEC_DECODE_CB(xface_decode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/xl.c b/libavcodec/xl.c index d2037b9f09..6fb050d71f 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -134,5 +134,4 @@ const FFCodec ff_xl_decoder = { .init = decode_init, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index d62fa164a5..49c8e8e7ff 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -161,5 +161,4 @@ const FFCodec ff_xsub_decoder = { .p.id = AV_CODEC_ID_XSUB, .init = decode_init, FF_CODEC_DECODE_SUB_CB(decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index 8ca411e5af..cc0fc094ef 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -218,5 +218,4 @@ const FFCodec ff_xsub_encoder = { .p.id = AV_CODEC_ID_XSUB, .init = xsub_encoder_init, FF_CODEC_ENCODE_SUB_CB(xsub_encode), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index d73bd46284..79edc16335 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -443,5 +443,5 @@ const FFCodec ff_xan_wc4_decoder = { .close = xan_decode_end, FF_CODEC_DECODE_CB(xan_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c index 4b1e64aff9..717909745b 100644 --- a/libavcodec/y41pdec.c +++ b/libavcodec/y41pdec.c @@ -89,5 +89,4 @@ const FFCodec ff_y41p_decoder = { .init = y41p_decode_init, FF_CODEC_DECODE_CB(y41p_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c index 390bd10ba1..77864909a1 100644 --- a/libavcodec/y41penc.c +++ b/libavcodec/y41penc.c @@ -87,5 +87,4 @@ const FFCodec ff_y41p_encoder = { FF_CODEC_ENCODE_CB(y41p_encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index 94d0388f31..4f629bd6cd 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -459,5 +459,4 @@ const FFCodec ff_ylc_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 7a11ca77b8..50bb64bf87 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -275,5 +275,4 @@ const FFCodec ff_yop_decoder = { .init = yop_decode_init, .close = yop_decode_close, FF_CODEC_DECODE_CB(yop_decode_frame), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c index bbd213e698..4a1551eb6c 100644 --- a/libavcodec/yuv4dec.c +++ b/libavcodec/yuv4dec.c @@ -81,5 +81,4 @@ const FFCodec ff_yuv4_decoder = { .init = yuv4_decode_init, FF_CODEC_DECODE_CB(yuv4_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 08511ca152..8a0d8bc677 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -144,6 +144,5 @@ const FFCodec ff_zerocodec_decoder = { .flush = zerocodec_decode_flush, .close = zerocodec_decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 37c18e3a14..a6d9824197 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -655,5 +655,5 @@ const FFCodec ff_zmbv_decoder = { .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index ef21a189a6..c63f411eb5 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -428,5 +428,5 @@ const FFCodec ff_zmbv_encoder = { #endif //ZMBV_ENABLE_24BPP AV_PIX_FMT_BGR0, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };