From patchwork Sat Feb 4 10:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1868809pzk; Sat, 4 Feb 2023 02:44:59 -0800 (PST) X-Google-Smtp-Source: AK7set+i9NQLeX7qhPnlatBkFVxE9hIYTh1umQfxKg0t8e+gi7dfJM1tyaqXVpDgMHJilXJwSYcb X-Received: by 2002:a17:906:3a51:b0:88e:35:4298 with SMTP id a17-20020a1709063a5100b0088e00354298mr11155187ejf.68.1675507499732; Sat, 04 Feb 2023 02:44:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507499; cv=none; d=google.com; s=arc-20160816; b=fodQytZcr860ojbFxOAv4EOnO7VAqr/wf1NAN3oAKXeh+kOMgIekHTP1oXfA8vYZXG 11HkNx9Z9CKERfwJf+m7wB0DJ3e9KQjYvj59MMsaPfUwqEu3mXsEkMV8AgiLXvrD1OhY xH4L1UjCvgY6W6kK7u/QFBj2U/n7XXLw8AX31LyGH30j98WyhMJHZ8f0HZwJKvvGczcQ DnW9j1Dh9aYyvAHXwaePEX8hAK36min6NPKktqKLsJlABAinXnjIl8KI0BWEM0r3I4Pr LMHmcR8qnfUCZZYmGVeHydZRotOtWbBH4Cs9mRUHA3YrHzlay2T81/WWPb/HCQvH+XVt ZmAg== 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=o5Bwt/ZajWv8pvu+CPPvzh4wGxdtUACsuyupQoWWS+4=; b=qjyttnu5bp+ThZet+6qAcMgehVVy3Ipc4W+bMVihAjmsNwY38g7Y3sqMzZkn7ob40o fR1ZTz5siuR2IXfaW7V0NhHT4V6lvTuSO5wbYgYnHvfMJlcFDZpQzJaei6BKqcioJMYM aOQ8rMXkAw0lxt7h4SQ9kXZZZ9SYIGUe3TWC5E2jv/ShRh/PjY3ulEXgIH0nR8KG1ezT qgLMWmfB9zA3rEzdwF0WlkDDXFTOaY7HUSYrkKTC9856vJNpADER9OqyJfUG6vvW5+bO Bct8hT4pHTj3WLs1+5q60w6xZIEk2TDPm0JGOo/DQzsN5cnP5dFdD8R3lDrEo6jtHT23 GQyQ== 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 ss28-20020a170907c01c00b0088c3baf23a2si5488090ejc.558.2023.02.04.02.44.59; Sat, 04 Feb 2023 02:44:59 -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 E606668BE95; Sat, 4 Feb 2023 12:44:19 +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 6D8E768BE76 for ; Sat, 4 Feb 2023 12:44:14 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 205362405B5 for ; Sat, 4 Feb 2023 11:44:13 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dBlnCNuWKtjw for ; Sat, 4 Feb 2023 11:44:12 +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 F1FB02406CE 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 D50E43A0505 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:48 +0100 Message-Id: <20230204104204.20721-18-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 17/33] avformat: remove FF_API_LAVF_PRIV_OPT 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: 4vJLXfnNh8Ys From: James Almer Signed-off-by: James Almer --- libavformat/avformat.h | 3 --- libavformat/version_major.h | 1 - 2 files changed, 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 49e50a5120a..ac40e197f62 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1242,9 +1242,6 @@ typedef struct AVFormatContext { */ #define AVFMT_FLAG_BITEXACT 0x0400 #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) -#if FF_API_LAVF_PRIV_OPT -#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, does nothing) -#endif #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 86af3ee4a5a..abc1699685a 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -41,7 +41,6 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)