From patchwork Mon Apr 19 14:09:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557426iob; Mon, 19 Apr 2021 07:13:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0rk6YF81ylfENl192FIHip1L1vsHYbnXg1EQgrbV18sCx5yFkQ5y9wQyBv4Z6ldCqEzPd X-Received: by 2002:aa7:cfd0:: with SMTP id r16mr12739878edy.330.1618841625919; Mon, 19 Apr 2021 07:13:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841625; cv=none; d=google.com; s=arc-20160816; b=0/odwsK5T2kJKyQDOhcg6B5OVHlHDxO6KDXAw5QOycU6qw8LfiVciCGuuOx0hnnSb8 YqZfEjeYcfD0tiGXUi46fw0bSyB7Cyc6X1H3+B4wsMZf0/4A08zrotPSPb6qI5VJ6nPr EsVjZe5fT4nAh3jxP3pMpZoZly5fBktOq4m9YpTWqwzwBqQcTpUcYX8i7nvoofBAsW/9 hsVhypimWM5DDah9onqRR2I/STObzglz3hd6Ds61ev4GHv095Hzo19scD5Rxr+yXGUTe AyU9FJh+q13lNU6SDm9LRKuVCBjNU40SMFLz2ha3bPzuwOstuEFWZu7sdoFOaPDjEuED qY4A== 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=X+/SlBVW3e4m8i/BFmRRoxHg6W2qos51jHI/1Eq4Bes=; b=rix7eGNfnAdMOA8Rv6LSHfIAidYc9ZWghXnjokyZrVDYSAKzde6k9huuEQmx1KMUZZ KLjaC3+qdlAy5Jz8gmyVEQceJjxMPGt2YVoRSLhDceMQqTejojJbLnaVqqLbRP1HQw1I +BtOeLOg4dn0jpczdIxbpbhu+2laav8cpTQL3nVUOF26N+uat9FdfXr6WAY/zBT3L+Qy GnMHmJc74/zEJHpQqZ92AykGoURXZaa/VT9UFj5WZ3TkO5rL48gSZ/dl5Xiem6tlpeyE RQlVyuc/vUVMAFc1SVgJXa5LtDmYkRD7AEUtl3Loggavy/1GoljKaNY3EwEIUqqtu/rG BLug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RHzqFuAg; 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 s13si5536414edr.443.2021.04.19.07.13.45; Mon, 19 Apr 2021 07:13:45 -0700 (PDT) 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=20161025 header.b=RHzqFuAg; 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 B1E4A680CDF; Mon, 19 Apr 2021 17:11:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5FDC680C80 for ; Mon, 19 Apr 2021 17:11:35 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id e13so26001705qkl.6 for ; Mon, 19 Apr 2021 07:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UTqupjVeMR+60iBRcZ0TKNt60mLTaNu4qNXmZcBs+WA=; b=RHzqFuAglWKLa/PYi9CKA1etfApbHj2G6V0+cFDTR36p9b9ONANTe4EJhTWqpIP13S ZdtK0GYQXvmrKTQb0k/V9kShk/0Ac35vYu6T4omrPlQzeilSIi2Et2Jvs2tDe0i/0eEd kLqNlU+qM0L7U+Jq61fY+9UdYfy3VnePOmlAq8urYN1UoHKzSGn94nHeWlhUoDwiOnCg ruAzATpsVexTs5V1RHkDWuw/ReDG5+gx92s6wiaMk0FrDkKHL9bjHYiOQRwonCv7i8v7 iOqpjZrmujzeBxB6umN0ye/vdJoUHjAGbhQYicsms2gToUYNOBC8BXiQ8mtDqb+XgArE 0cLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UTqupjVeMR+60iBRcZ0TKNt60mLTaNu4qNXmZcBs+WA=; b=hK4l34LKbXxrB7ZPUG20JGkCNEaIF97+vkEvjpE+c+xuXqBnbp/g+/WZ5orgrgQxro 7sgjg77KitOutcGWA2vDZGD+gv5GFZ+TRtdXkO6qNcQkp3xjfeG09JXyyPTazJjF/XRH fjTkWeLeQ+mW1SSAd6/rSsJDpQ+1QddJasa3hQh/9HDoSJlaEBloxB077GUaVCdZabaf pjOm3/u3M969qsEtRrriwIpKDRMEnijWW/j26cY1g+NbQ0ei8p9oa/Y+9zn3EBApoQBO k+KwWFZuhoS1n7r2Zgl2zPQeqlzn3m74sktT0Xl6Y4UnipkUkutGe0B8B6Hz+5cHfFqp bzVg== X-Gm-Message-State: AOAM531283fun26LOIkeuLBpj0j8bvz5aiQsuxj9x0dkDS44Or3v4Mmf cL6M5QN4qohRipdQs8I/H1eYtP4obZs= X-Received: by 2002:a37:dce:: with SMTP id 197mr12051971qkn.180.1618841494409; Mon, 19 Apr 2021 07:11:34 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:24 -0300 Message-Id: <20210419141024.8174-28-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/87] avcodec: Remove deprecated VBV delay field 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: q+k1rlkZ7/rA From: Andreas Rheinhardt Deprecated in 2507b5dd674834be7261772996f47ae3b95cca69. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 13 ------------- libavcodec/mpegvideo_enc.c | 6 ------ libavcodec/version.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 909fb9172b..89e32f1c80 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1854,19 +1854,6 @@ typedef struct AVCodecContext { uint8_t *subtitle_header; int subtitle_header_size; -#if FF_API_VBV_DELAY - /** - * VBV delay coded in the last frame (in periods of a 27 MHz clock). - * Used for compliant TS muxing. - * - encoding: Set by libavcodec. - * - decoding: unused. - * @deprecated this value is now exported as a part of - * AV_PKT_DATA_CPB_PROPERTIES packet side data - */ - attribute_deprecated - uint64_t vbv_delay; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1613d06023..8785f25787 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1913,12 +1913,6 @@ vbv_retry: av_freep(&props); return ret; } - -#if FF_API_VBV_DELAY -FF_DISABLE_DEPRECATION_WARNINGS - avctx->vbv_delay = vbv_delay * 300; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } s->total_bits += s->frame_bits; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0595af73de..147bcb08a4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_VBV_DELAY -#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif