From patchwork Sat Feb 4 10:41:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1870131pzk; Sat, 4 Feb 2023 02:47:06 -0800 (PST) X-Google-Smtp-Source: AK7set8lxyMEnmpY/AWDud9maAoEkBqCt5XNyB5rno3Yri9AFrv2NyIcgGkXTbaAhFAXrMiorIoc X-Received: by 2002:a50:9f4f:0:b0:4aa:a118:13b7 with SMTP id b73-20020a509f4f000000b004aaa11813b7mr1132746edf.10.1675507626023; Sat, 04 Feb 2023 02:47:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507626; cv=none; d=google.com; s=arc-20160816; b=0F8mLCvWvuI+WebFH9b5LFAaJqRvNeKN2GoJQrL99KoPrnBiJjLznYZi3ecKA0V8KS G3R7eSN5/ek/yfeSuozjfBMPTHQNLQbnTLGNyqXNKv5o1UiQvHNzzPseHc3Vybd2Vnwo LpWMWNEqZCKzzKFX+G+4Kk1kvprbUTctkbA2SbjvLTAVUddGT7OjjmelX+tNCE6Kkeqs 86sg89O1cBchGvf+Qk4G+P0iFyyjjiH3po34iPZcyW7RvbHoJGqy0TPLK4zB8KJB/PK7 YST7v3tPmCkYtpCqZEVaMkVtltHsy1drM5GMCNbINUvQFtxOmJI8pSg72rdze+nHl/d8 MLKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=AQlEci4sD6vZ6dGsgiGZYMiXYxOA+gn3gDKQZsuEFX8=; b=bGVsSKUcQ8FRLKi4mjRIVfa42On3LI8K0kal+uvHYsYwBK2va5mxcO61bE2pkAUztG s3yiPrBLYhhprqL755EhZWWJgbJW/6s2h3F8WGnlayfZQuuNPJMsf2GFG0SNC/a7Aa8v tJsqQSSb4jLMEQtWk35w/O8xmOShVaElWbLY+5J93c0Ne5n3jzzoLz3Ini4lafY9RnlA 2SWE3kezVaRMYnulDhNpA9YTKIEfDiQulWgXKi7yxumMVVpkK/HekDZqeaT0JmiUbovH aZ70A3ItqOrSy8eynYPB6MG1k3eB/49wreOIyIzKcjw5WAeBW6sCxqy2wb4QtKxQINfI n44w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fb19-20020a1709073a1300b0087783864543si5608379ejc.591.2023.02.04.02.47.05; Sat, 04 Feb 2023 02:47:06 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E18868BF22; Sat, 4 Feb 2023 12:44:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5950F68BED0 for ; Sat, 4 Feb 2023 12:44:13 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BE0C92405F9 for ; Sat, 4 Feb 2023 11:44:10 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id UIN2OQQ9BgbE for ; Sat, 4 Feb 2023 11:44:10 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E14CE2406CB for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A65EB3A04B7 for ; Sat, 4 Feb 2023 11:44:05 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:44 +0100 Message-Id: <20230204104204.20721-14-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 13/33] avcodec: remove FF_API_AUTO_THREADS 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jyQ+i8hpj3Xb From: James Almer Signed-off-by: James Almer --- libavcodec/codec.h | 3 --- libavcodec/version_major.h | 1 - 2 files changed, 4 deletions(-) diff --git a/libavcodec/codec.h b/libavcodec/codec.h index e10fcb9c7c2..8bf85b2f9c8 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -125,9 +125,6 @@ * multithreading-capable external libraries. */ #define AV_CODEC_CAP_OTHER_THREADS (1 << 15) -#if FF_API_AUTO_THREADS -#define AV_CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_OTHER_THREADS -#endif /** * Audio encoder supports receiving a different number of samples in each call. */ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 1a6a60942fc..1b96c4c8fe9 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -37,7 +37,6 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60)