From patchwork Mon Apr 19 14:09:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555997iob; Mon, 19 Apr 2021 07:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSH/8aolBbAi1qSQ8cJQKgWrsWWXmiMFjWBu5N8aedVubGdyIgjqtDuwMOisM0JAdAzDR1 X-Received: by 2002:a17:907:3f08:: with SMTP id hq8mr22717990ejc.90.1618841522969; Mon, 19 Apr 2021 07:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841522; cv=none; d=google.com; s=arc-20160816; b=r88p9cJKXrTvRfym5XE7/AtFj30qQe/k3xyS9aDISgGVQT3nyQ3GwelqRDffbcHgvV 42iQ4RpKf3lTzdQTDiXErvWp6/XgLJ4PMOs3QaQt7vKN69w0++N3xINEziQRfoVaBCIX Se3tABzsIBW4YkQxQvjOwEyzrIFf/56PZB3QCk3ZRRYzwfkLmpoVJl8W44HQcTp8i6/4 onSlqA02xKATOZ1JBo/KebC1W/lsuSZ5hucsjLVWSFTHe2WTnXbkG5fy5Qt1NaYfsBZd 3suwsKKvafCKgPonRiCCUg57Ff1AbmN5G1PorSTHo9ZhukddPoba5MQWTVXl0GMVCVOq RdtA== 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=/VsKwdVJm4TF/YrD6bXkbMjY+QdI8wSCX+RxKw2Aprg=; b=FABxo4jSsPbkV+kU3j7P3MTEdZmoK94/rK4V3hRdaYPRhkgyxTlL/LU777lWa/oW5F haDEZCPlvvDUnXaym0nINh48dgqtNN2rIP9Iaf3PUCnGetzlPm8zmbIJfcKMxOrtHxpR 9ItpWYdkMNttNt92uPG+8vxwP96TuSMlheVW4BLl6RZFCIczi65ssRJz3De8xEN1wTti 7+YyVu2o4FHGoN4Sx9W97n6fWJ9nZR/Xy1pXFzgVj9NjbHtL4scdSlAUNHaGGNLAGDHj nj8JSW1K31aaK/7BmkeLV5QuXe8OhsP0lQUIVJGbpvEg/kNwRuvEGzk6UElm4fd6gvNH 2CXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=di+1ers7; 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 z13si12773531edd.128.2021.04.19.07.12.02; Mon, 19 Apr 2021 07:12:02 -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=di+1ers7; 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 13A1A680745; Mon, 19 Apr 2021 17:11:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED0B4680271 for ; Mon, 19 Apr 2021 17:11:22 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id v7so7769369qkj.13 for ; Mon, 19 Apr 2021 07:11:22 -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=yXx0+JsBIYAKH844l9UwQ481DfoqxOCnPdyviey0/Do=; b=di+1ers7CsAXlduKBJ1SRb1M7yY2nelbwc6TfnTpvBGFG4FnDhv1/rqXA81jRTPUsI MLR8jHODQUnCX0xGr9tHBzGEghjmtI320olRV+FD+twcwarCUWNSOanhLprmWn6EWdTj E3MewqNnWkEex118azhhGZN7cNrdf8jSjCeN5MkARUU/punBCwSaVB9wKJPYKfZcDsxF KOb8llU+JjmJioiW/kUdlr2h8RjrDcnDJkzdaSwwjraZBB3sbNt9JI70Q3u8BoiGnwNl wXf3/RqdkWT2pW5YZl2QoZDXQnsI4ERfUbqZnGfE+t9WHEkyM1pDuYT/YDrC4SciZZ+H ldyw== 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=yXx0+JsBIYAKH844l9UwQ481DfoqxOCnPdyviey0/Do=; b=Sc1ZG6j4Qh5RbLahAwibNXMXD7OFAxjFZPEoJs/5dn9oryInhS3FQ2EG/KYs/9g9vE 1VvyVRBHEcspvnBrbNJ698ixa52y4g5nVznbowtTyQW4KgJmb2S5aY6oqRjFnSFmSdJD 4AlUlbJnbg3FMl9/OYuq34ffX3B2Zx/4R+aNpko2x7mEcM3Xkz0kuyVVjsAWHj8t7Gn9 XzCTTUlt0cWO2XOH1TQsi5In2kPV50NhGoCvNdGdtSC1NajBdggSAA0QDhp/ps3k3TmD A3p8RKnCHQAS0wOrMoYd2Gj9L8szvQdSpQCeij3IXWGbjRwBMh9sqkHi5r3zWfQJSE/I s94w== X-Gm-Message-State: AOAM5302OxVkxwtWjylLcUI+EhwFGQV3h6nJGyEy21CRtuOoOfW1paos g9RNsqDzmywcmk22ZWYRA2i77lDmKXs= X-Received: by 2002:a05:620a:1093:: with SMTP id g19mr12409979qkk.112.1618841481598; Mon, 19 Apr 2021 07:11:21 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:13 -0300 Message-Id: <20210419141024.8174-17-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 16/87] avcodec/bitstream: Remove avpriv PutBits API functions 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: kCY1aeGqXtTb From: Andreas Rheinhardt Scheduled for removal in 717503f7166d7032e32b935f2819d450524125d1. Also remove PutBitContext.size_in_bits which has been scheduled for removal in e7cbbd90267de2a0ad1b5fa8ccb29ab7bf8a26b8. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 11 ----------- libavcodec/put_bits.h | 10 ---------- libavcodec/version.h | 3 --- 3 files changed, 24 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index e425ffdc96..f0488cafd4 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -45,17 +45,6 @@ const uint8_t ff_log2_run[41]={ 24, }; -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s) -{ - align_put_bits(s); -} -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length) -{ - ff_copy_bits(pb, src, length); -} -#endif - void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) { while (*string) { diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 15c2650724..689c6b282e 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -33,8 +33,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" -#include "version.h" - #if ARCH_X86_64 // TODO: Benchmark and optionally enable on other 64-bit architectures. typedef uint64_t BitBuf; @@ -52,9 +50,6 @@ typedef struct PutBitContext { BitBuf bit_buf; int bit_left; uint8_t *buf, *buf_ptr, *buf_end; -#if LIBAVCODEC_VERSION_MAJOR < 59 - int size_in_bits; -#endif } PutBitContext; /** @@ -177,11 +172,6 @@ static inline void flush_put_bits_le(PutBitContext *s) s->bit_buf = 0; } -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s); -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length); -#endif - #ifdef BITSTREAM_WRITER_LE #define ff_put_string ff_put_string_unsupported_here #define ff_copy_bits ff_copy_bits_unsupported_here diff --git a/libavcodec/version.h b/libavcodec/version.h index 0e9c92a9f2..fbdc99abca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -93,9 +93,6 @@ #ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVPRIV_PUT_BITS -#define FF_API_AVPRIV_PUT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif