From patchwork Mon Jan 16 13:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1037924pzb; Mon, 16 Jan 2023 05:40:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXtUdxzXHQo9PGscDmTplXzSlh+nHgVwW1vSl7nvwhT1VKRLqDtQpX2Rknpe2CmwNIMXEEih X-Received: by 2002:a17:907:d302:b0:7c1:3472:5e75 with SMTP id vg2-20020a170907d30200b007c134725e75mr84324455ejc.29.1673876458410; Mon, 16 Jan 2023 05:40:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876458; cv=none; d=google.com; s=arc-20160816; b=L2DaT9SSANlz1I8w6BhOkDTRHB7UiLuX6ZSpWOP6tiQO7n2918mOHBqQ3cHk4iAuGb oTeD1FX8Yk1cdqVGWfvx//BJlXDGB6PxFE57Pw2eeWdrbto/Bh/e78n0mlftv1ydwD4m hb22TZTTZgrpdqiz24EuZ1hXKsP9pmRhx6BRgPtqeKVI4FdSIqCd+1Z9cyy9KwgEINBb w7Cl78MElq+ajZ01IfzHkNAlDjBgmm3P/5jqF47IqvAF9e+QMGA7ZVVcklsR61/vgra1 0k3LoKZRtPWAoC+3r9Qb70Vqs7FhJzanTaT4OCGImogxPaC0fghua/u26ZuAj9cxHH6G 6T1g== 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:dkim-signature:delivered-to; bh=NKOkLKiCh71e/ocY04EqQ6cNTrBftM1SM7ImjzhCqW0=; b=hlCvVhosL7IxDyrXQugfDQjEm7RgKNHSYd+H+vwN1P0WWlnw/Nd2d7+uC1HKxGpKB2 3EIRjOVq/XcWyDyV+rcjzo64/YOZ5+RvqttKWV5gvIJhdP4WbTDMAelhAkPJE2YuzJDA Tf3a06RPwYA3SRSwgzpbt1+QvIqpTUJ8pGDURfgCV1UeVY0WPtlJBMrk07tMWFWqBYT2 DGaQ1fvxnbztjvL8sLec1fTwnhxFjVo2dpzYPF0oiNHVyEAC3yScgcw/7ohR97s6Ps2J dElK8KaufKh9O03gW9ZRn9UtLYSa4VZvy0Ha0GEI6Jda18bk3Hwil0aKDQmSNzpZRMZT jtZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gp4L9HA0; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ga35-20020a1709070c2300b00871773ad4a3si1803063ejc.817.2023.01.16.05.40.52; Mon, 16 Jan 2023 05:40:58 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gp4L9HA0; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3FDB068B907; Mon, 16 Jan 2023 15:39:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 683E768BDC5 for ; Mon, 16 Jan 2023 15:39:22 +0200 (EET) Received: by mail-ot1-f48.google.com with SMTP id x25-20020a056830115900b00670932eff32so16118090otq.3 for ; Mon, 16 Jan 2023 05:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Gl8zpAkwpgCSo8VfXKkZAoLcif2LG1iyJ0yTTxgshxQ=; b=gp4L9HA0EvxLxPoNjLzuReF1mA8eJfoz88KCTdFW3DuzM1OP9MPWQtFJW9pI5WcxkS w/IZ2ncsxmSGx8qbIr+/4nsb6Sq9iTsJYs1J74PN8jdy6sMmUeZqnVkJQnTtCSG277HP yeaJTIGC63CML7XLzLmR7SQJdgn+/Nf/cY6gQekNTwBYhU7VvJASAQV6cnTU+T5e6tZY fBRkSvlI+4YlB7kPHmDkU8RqT0dgVMmkBzxMwFamNoWte39B+251qmP4ZahHJGouee6v PoxoBKkNxlcCJKHzh92KxZNyElCP/yEcFbIcAt06+6pObWU2WGDv95j+Ex7fJx7fd08b RLqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gl8zpAkwpgCSo8VfXKkZAoLcif2LG1iyJ0yTTxgshxQ=; b=XGRsf0PEXzrq4s0rqLQvDHAHHE1MSnKGojDyKVhexSpjB9cFHD/wv8tZgq3jVixg3Y g+nfr0mYJFFc6gl3lB7V/T4q44XQ9KCI5+7anAAlc4XDrYlXMeMpRdodwEPSBHYTFMOK SvEQef+BYjDfj9Xu/owG6z9IZERkkoz9xVAg3DCx4op9kPEWyycU1FghmTipZL+VnjLp pbpHQRh3c6XZ03j9bAudBMS7WqWjMZmu8rCu5CedMMByoMlWCgFyPtIyS5zdS/l8gPCB P/F79/hXhBTfLHQ4c+oLofqKec53+w9Btau2PugMG0ObLQdJoxkgkEr8mgQtwYz+Nzot VNYg== X-Gm-Message-State: AFqh2kqTHffiSBxYxpsrw/FHdqqWXdrYR7cm9XNISWCPO0m4AF2LIZLQ tZ0kqU2Tl193OmPaaRn2RXn/Q/EYlAI= X-Received: by 2002:a05:6830:6486:b0:678:2963:3832 with SMTP id ck6-20020a056830648600b0067829633832mr53352809otb.20.1673876360489; Mon, 16 Jan 2023 05:39:20 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:25 -0300 Message-Id: <20230116133840.512-12-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/26] 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: gWIZ0IHVQhmS 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 1d97d56ac5..b40492703c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1352,9 +1352,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 86af3ee4a5..abc1699685 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)