From patchwork Sat Feb 4 10:41:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869622pzk; Sat, 4 Feb 2023 02:46:09 -0800 (PST) X-Google-Smtp-Source: AK7set8VLvS4YfdwLAqQI74+MUtu85BHzu3ffU6sYZ+snwfPU2on01aVKYH+Ojwy5dwYRk8UmEfF X-Received: by 2002:a17:907:6f1b:b0:889:b6ae:75fe with SMTP id sy27-20020a1709076f1b00b00889b6ae75femr12705021ejc.61.1675507569008; Sat, 04 Feb 2023 02:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507568; cv=none; d=google.com; s=arc-20160816; b=vszv4yNZxKaFFBWeKR4RR8P6rPGUNAd8w21q8wGS4WhBpU7vtM/42Lm+Jw9GkoRrR8 /AxHdcor3erdbuPRV1CPv3gD5mqn2JcfG/ZafUfTtaLXlwF4ifLOa3AyYYhi4p+5ENZZ lDMQcum+8PpcXV0wk9l5jiyvcogKHQzmCmfTuuI1SjIe3op0TqR6t3/yjN3p8rPANQd8 t9qqK3YqBTIfzIia/AwIVy6c4a7utIFyxEXvXdup5nvP0261FRkWDLqosGEe0ARs6KSG 0FwmFtW67kdD+ZegciIadn0Qx4rIwg0zHuQP9M8VfK5papAmPrl+g6Tlk7j/uTdxHDVW LxdA== 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=0J9MQh80wUOJ7RtbyqHWBiUnJH5kvX6oxKoJ0/b9LDk=; b=YLlRFoTxTXGn2r+4RWgPe5seEcEkliLTOaMwSTj8yapSUHzPSgT2BpEhvZRdVXBcfw uMd7DWWgK0I5M4A2BSfA3r/fCk9wI1l3rE0y/fP20UZ8LcR8PJUpOzXYyt97C8k2GeOU PL4C8FlbN+lyY8Rh0dVj/GIyRTcU+rwtStkHbSafjlzFhjv8GJGaz3D8y7DJ3AU+ar3u jFt1p3vOLxcgKNyjgecBHp0Sfi+aSVeL56bXEpG/f5lOFbfnf3T35FCSRIKL+2cb13O4 SpuovJ7+mcuIXa6lp0eLmkekTXrQs2/XdAaG/zmy8qbYRNZwY24Mp7upAeEeMgd0fOUl 0amw== 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 vj16-20020a170907131000b0088f91df9220si4569854ejb.445.2023.02.04.02.46.08; Sat, 04 Feb 2023 02:46:08 -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 3E79168BE48; Sat, 4 Feb 2023 12:44:28 +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 5265168BE22 for ; Sat, 4 Feb 2023 12:44:16 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0FBBA2404EE for ; Sat, 4 Feb 2023 11:44:16 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id a3pwfRDDdupD for ; Sat, 4 Feb 2023 11:44:15 +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 257DE240D1E for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6C5BB3A03F2 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:39 +0100 Message-Id: <20230204104204.20721-9-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 08/33] avcodec: remove FF_API_OPENH264_CABAC 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: xfRgrmAKrRZV From: James Almer Signed-off-by: James Almer --- libavcodec/libopenh264enc.c | 6 ------ libavcodec/version_major.h | 1 - 2 files changed, 7 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 4dd15b0afe5..8b4755f5ba4 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -50,9 +50,6 @@ typedef struct SVCContext { int max_nal_size; int skip_frames; int skipped; -#if FF_API_OPENH264_CABAC - int cabac; // deprecated -#endif int coder; // rate control mode @@ -72,9 +69,6 @@ static const AVOption options[] = { #undef PROFILE { "max_nal_size", "set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "allow_skip_frames", "allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, -#if FF_API_OPENH264_CABAC - { "cabac", "Enable cabac(deprecated, use coder)", OFFSET(cabac), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE|DEPRECATED }, -#endif { "coder", "Coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "coder" }, { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, INT_MIN, INT_MAX, VE, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" }, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index e9a4910df0d..cd4830c69ae 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_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60)