From patchwork Mon Jan 16 13:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1037981pzb; Mon, 16 Jan 2023 05:41:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXv7nL3nd28bIxlqz7faxPa6U3iDFhptLhW6fjKyBB/CB7dNuiDEBDVpQATOVXTuJTaDyGli X-Received: by 2002:a05:6402:f12:b0:49d:eb02:fd36 with SMTP id i18-20020a0564020f1200b0049deb02fd36mr7993175eda.41.1673876463265; Mon, 16 Jan 2023 05:41:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876463; cv=none; d=google.com; s=arc-20160816; b=wtPH7c9P16Ts7fRpipcs0fglkv3EMDxSiXgUoMIbA0TjMbIHORmuapSYCYvcFgfb9Z FnDfkXao1WV55BqPj7W+hjQX9U1eDwEY10Q3dIb2ZGCxMzeKMNFA62whUZPceCXqoxid ZkhEma8OGfROqd/g1bIBI9WVOwR9bple7mgHfjPMqO7EbatfRNSYGwVKUfzqfLSb+jJs ibWH0M/+CCG571kKPCq5nJ/gu28SnnrvTlorqT1WOT71UgGkJ860pDFCvLUu9A84HAhq /K6rLUXkuHk1f0OGzXRNR/ku41OwdA4IhqnGZXHMHVkSybONyBcdj3g+IvWUvdxyfp0U od0A== 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=g1NVxmpKWYUTbwoEqMX3akpq4h0peWSrqCaWBgNCCFg=; b=GACIRQnL1HMH7D21XTC3enl/o4G1C4Zcb20svhklkDeqDwudDbcTVvnRpXAuEHTy0K htT107H6D+OyFgrj9T0iYRqjcRGNhReZBiS63j5ROlUhv/0WGPGwZ3PpmLeq9dmS1btC 78LCM7pypsjrzeMobm5xwqbQWtOxe9uhDKYhJCswAcnzPJyP97LtCgeautRxy3pfhOWq EZw2Xzd/QhuI+ZR/C7li9xnwT8M26veBNIDrZxU2vlDzQycDafGB3dCj7BuBfjfYzo3K ETjaO4JG0metB2hPrQi4ryp9hcsdK5E0gNzp5k2O/sFv8COIXRuUoRaNrF+0DWpotx9v Ymhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nlH9Uiiu; 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 eb7-20020a0564020d0700b004859d0f61e0si37164421edb.380.2023.01.16.05.41.01; Mon, 16 Jan 2023 05:41:03 -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=nlH9Uiiu; 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 0EC7E68BDC1; Mon, 16 Jan 2023 15:39:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F44968BDCC for ; Mon, 16 Jan 2023 15:39:22 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id f5-20020a9d5f05000000b00684c0c2eb3fso7054864oti.10 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=xHVsD2PQC2i6WUTCxkQG8m0QLWAEjZMPeGYI1O5mjAU=; b=nlH9UiiuhkshtFE0yAmO0f6mQlxNBO/uXiGgzwkaC50+xw+Y4XZlegeNqLcI15wvBg FZFQkgevzhexFeD+nUWASkP1WEgnKTi/EHigMlH+SWQOaRqJMadon9Lqv9xUylbMvMlF xl/ePvDLJn2oh56Jfqtpf/LFwFMU4O658Pdv9DYLQLC2HSkOCWTocgR2tMD/1VwkJywN Jq/+rSAnAUCJXXFH52WltgF3ItyKQG7NIJUDwpLEAFcV8F3crGYFFgiVNC4yN9uBOQ8K Hm/O5MGnUpPdd9mEJabb/lpcrDryEY35hq98J+5kUP3VTM4uAruJ/7t+dumww2obW++t BNBw== 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=xHVsD2PQC2i6WUTCxkQG8m0QLWAEjZMPeGYI1O5mjAU=; b=qPs4JMTnIb6LFMIpWuZDnfsustdJ1CU41pObxQZBm7G1vFykzFdtFQxZ9Kq3bdwLvg QjavW8U8gymi5ouw+K8xxKUhiWDXNhKHiJBKGR+xeVLsYB9yES4i+UR+hNiTgDrNxmxr gkY4puf1aJbtRvGewZINaL6tTj4MVTnydN7jcomM/a9wsZRDkGhghoahX/dxDgtYlW1p sr5y14tuThYrQCWMKyO0rj7pnQx7FvDPsKcquAXnSs/EbYx4SNDgKZodBg+cZJyS56Jm Tj7gK5kbMRfLcpTZJ3GtcwdVXflDP9Xipv28ZUCg0XWoN2/+InkCCTjgMQi4/CP3nVkK 4N9A== X-Gm-Message-State: AFqh2kqB9aGY5gNKSAJHW+57mlmxonqGXZ64j2F6oZ3Ud1/ziwXWD/rL AkpN/zckXdQI8dHdXSkNmskRmMg8Vqg= X-Received: by 2002:a05:6830:3819:b0:684:b6d7:c804 with SMTP id bh25-20020a056830381900b00684b6d7c804mr11452042otb.18.1673876361652; Mon, 16 Jan 2023 05:39:21 -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.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:21 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:26 -0300 Message-Id: <20230116133840.512-13-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 12/26] avformat: remove FF_API_AVIOCONTEXT_WRITTEN 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: CxLjdSdiH36Z Signed-off-by: James Almer --- libavformat/avio.h | 10 ---------- libavformat/aviobuf.c | 10 ---------- libavformat/version_major.h | 1 - 3 files changed, 21 deletions(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index 4bf6b1fbda..5f13e0622d 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -295,16 +295,6 @@ typedef struct AVIOContext { */ int ignore_boundary_point; -#if FF_API_AVIOCONTEXT_WRITTEN - /** - * @deprecated field utilized privately by libavformat. For a public - * statistic of how many bytes were written out, see - * AVIOContext::bytes_written. - */ - attribute_deprecated - int64_t written; -#endif - /** * Maximum reached position before a backward seek in the write buffer, * used keeping track of already written data for a later flush. diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 257535a964..4ad734a3c3 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -125,11 +125,6 @@ void ffio_init_context(FFIOContext *ctx, ctx->current_type = AVIO_DATA_MARKER_UNKNOWN; ctx->last_time = AV_NOPTS_VALUE; ctx->short_seek_get = NULL; -#if FF_API_AVIOCONTEXT_WRITTEN -FF_DISABLE_DEPRECATION_WARNINGS - s->written = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } AVIOContext *avio_alloc_context( @@ -174,11 +169,6 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) if (s->pos + len > ctx->written_output_size) { ctx->written_output_size = s->pos + len; -#if FF_API_AVIOCONTEXT_WRITTEN -FF_DISABLE_DEPRECATION_WARNINGS - s->written = ctx->written_output_size; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } } } diff --git a/libavformat/version_major.h b/libavformat/version_major.h index abc1699685..044af1ebf6 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -42,7 +42,6 @@ * */ #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) #define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)