From patchwork Sat Feb 4 10:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1870336pzk; Sat, 4 Feb 2023 02:47:33 -0800 (PST) X-Google-Smtp-Source: AK7set+RGrR1rHrsl9+uER08v4ITWuDULjQGpZu2Ulk1RPTF/e3NY26VJW1Ag+pAzL6i+B5M1aow X-Received: by 2002:a05:6402:1f06:b0:4a2:358e:e734 with SMTP id b6-20020a0564021f0600b004a2358ee734mr13009448edb.7.1675507653229; Sat, 04 Feb 2023 02:47:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507653; cv=none; d=google.com; s=arc-20160816; b=ML7UKPw5uPGSmcEHAxmkGCgV1e5Ue3M0okwPSgzFDWJSdWuTIjOK4lyvohLgz+zTvs hWnkkFitRU/iWo99+ZoSlpowoJEjmIgLNl8/wmWnb2tiRpFPgbQBsnfVvf/SLHEHxJFI UCh/V5ekABBVXRmwQzvxZp5dA31t+2m7HJ02vgADrSxcEv1OcyOQwZ0xEKVdpT8i0KnU /AR3m2s1WoIt2WXIpNJmzRm5/y9O/2a+tlM9JwgdqxpuLnv0oiRrH8gYn7CfHZUOXe9I 1njHvIkpfPsP6SAgTHfGraLHkDEN0UzXg2SryQQpPe7yZzTdWoGMSe/1dcZfbVeFKoER 7K2Q== 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=tJidDAxFRS8lXA0xq135caY4EinNoez+Ke05GowpthQ=; b=0ImqEKRRuaMb2e81mDWQCjsk3IlGsnU7phqKWUmd6hFCkQKqLd/Z6bxfrtyUqJZW7O 9owZkobIyCHwz9gmGuW0cY66gYT1kMDq8rCfOb2oMVqdJANhNCZ7X/ZVpSIn2Quu4tdR HcCYYRWV20UOs/YqTd3OwgZjT36QxCYaH4oq89HFRi4VAnc5MdtOASL+lx4dclZafuxy xJSPclVk/IDMlwZichUlMT2adve6Dzegm7PRk0cgGT+14MRF4+aXz9D4CReMT8MJwZjR EVRkYJTOrZH/jIWSn12WW9gQ/pLpp0X7Ux9GtqlItCzOwmBiIfCqxc0Kd3RZyNgl3Ghv cmYQ== 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 m12-20020a056402050c00b004a0e5a0770fsi5429969edv.391.2023.02.04.02.47.30; Sat, 04 Feb 2023 02:47:33 -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 3C4C668BF33; Sat, 4 Feb 2023 12:44:38 +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 DA70568BED9 for ; Sat, 4 Feb 2023 12:44:13 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9B9732406CC for ; Sat, 4 Feb 2023 11:44:12 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 3m7kr7wAbQ2R 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 EC6E82406CD 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 E0DB13A0528 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:49 +0100 Message-Id: <20230204104204.20721-19-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 18/33] 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: kL/6WEQTUQNH From: James Almer 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 4bf6b1fbdaa..5f13e0622d3 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 257535a9642..4ad734a3c3e 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 abc1699685a..044af1ebf6f 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)