From patchwork Mon Apr 19 14:09:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp569364iob; Mon, 19 Apr 2021 07:28:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybdWnOQ9k7mFyeV8ye0DNRJ7twVd73zoAkkthaSj+zRm4sR++aaJcUntEP9Y5y9L7HN9Ff X-Received: by 2002:a05:6402:145:: with SMTP id s5mr25900676edu.221.1618842480232; Mon, 19 Apr 2021 07:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842480; cv=none; d=google.com; s=arc-20160816; b=l7C8gXa5xZmb4IBkBAtYOLONuA9L8LeQxDT2iCGCrbfAwJH9e4zMauf4K5ujTLEt3S lN2l3kDa+Jj74y3FZvK4+tseiKE9S8O3DGVqghSQpmuMp7tPkA+EGhSw1r5+zIAyn5xR TPiRUSWplXoCMSdN+46MbeeX1eI+nsvoZ0QM7ABvH4sxLyGAx/O9MAy0hQw5T8kR5O1m uiQEifIXpZurBhU1o6VZpvReWphjAzmIcbnCp/SVqs+A9UFswDinoFd6b3nGmSi7qw7J 0vb+yGk4Rp9Wuc9CufFzg17GYZBnWVkXLIX6lP2W7WngkLqRMzEHc9LFN8jTQHsJf0dQ CcVA== 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=dBVlnVXRShiRkGl7zhH4KhlfpkCpYYugE2Eoz1reqFU=; b=u3+7NRdxdQshHLKSLcODJFF5kxkaiR9TkSbpadW8/eHc13zYtynUtjM9EvegnPE8Zp tg4SBy89psXuhJwke7yPBY08Cor6wrIq28wrgrfKmUSLQjifcmApjBpBF58IKM5wVM5V j2PcZsJ4xYScey71KEDmzIOpL9MIsKcAzJr9WRT26OiBDQ5KUFGs23CxOuDCevY5tUfU d5MLzQdqUNtBlSVam8ggRS3JLVJr2DI/fFf+Zkwfb1omzxOB7a1alXCtMEnvUWBv11m2 BdJhC9INS8i9QD0IMLHhYqFhLp3circZ3blBVd1SwXHh1au65xcXwP/A9F82O4pUIZTz RW9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z0kMSmZn; 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 o6si8528788edr.244.2021.04.19.07.27.59; Mon, 19 Apr 2021 07:28:00 -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=Z0kMSmZn; 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 A54CC68A0E1; Mon, 19 Apr 2021 17:18:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C592D68A2B2 for ; Mon, 19 Apr 2021 17:18:25 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id d19so159736qkk.12 for ; Mon, 19 Apr 2021 07:18:25 -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=13yIhhMIdlcploWfhCY/8MIBgRO0cyJWckPp2VAn+qE=; b=Z0kMSmZn+3C6BderI1ZvAHe6tmxLLIKHacO5VZnSa2V90r6eYFsdW+sQRscLD0U62P bpvN7CFat6plxWKLDzgohifFLqTDXRAir6o1K5W9FQcr7P4+qTJHLfZOwGPZk11ykeIV zVSGUNo0dYFYxmTNNZ5j09cH8Cjo3yypkH2vva2LmLHDVtjrw4GbvErNFX3+1GPBQFq3 VJwEOcRW/yw4EXG5mKvIFscE4yX/cwWjaCrhW8GqtSVwp4OJwqhY2pgWCCWZsoq3s/0f phUOVQsKrGeu9LE3AHa4iweQ0PKsDVkbmQfrWQ4/cMuRhWocFL0DDEEty1CYMaKmmWyI b/NA== 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=13yIhhMIdlcploWfhCY/8MIBgRO0cyJWckPp2VAn+qE=; b=VkfQUzwOn/1SkVZTLhoEpyzmG+/EgNeNPoeQRUQPhNUp9e+KZ/jmNPlSQXipC5UviI 7zomDUuQqc6p6wPvhMC7mI9098rD//2IUz72Bf4X15GD7Eety5yazYwApQJt+BcxYjht o0KkqQfmt3CjjE9eP2LAKUkBDJq7lK1lGkMq+u1LTY8DT4Jixk/mqDaU/QVJGvk7usQY oEzFWmyw3F8fIKR5LLUHZCyP3T68Ozw9v1c3JbWfieTayGUKehfQnD8pM266ADJ+9mCA 1OfXZMaPKsfzZVLte+ffRUBwXXTpQr4O0JyTEkqKqbZx2LRKUA1xrOrYIXzy1GC7a7vA Vlag== X-Gm-Message-State: AOAM531dthoEl0XIXS0x2TFIFcjELCetJ4FTxUD+LlDFO2zE76VoAuxw x1nDTwNUxGuDWz0p+fhCTz6un4js9qc= X-Received: by 2002:a37:76c2:: with SMTP id r185mr11811702qkc.204.1618841477200; Mon, 19 Apr 2021 07:11:17 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:09 -0300 Message-Id: <20210419141024.8174-13-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 12/87] avcodec: Remove deprecated av_codec_get_tag_string 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: g1fDseOTVw7V From: Andreas Rheinhardt Deprecated in f156d35321bb600b2309b78185d600b2fa64d84a. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 16 ---------------- libavcodec/utils.c | 22 ---------------------- libavcodec/version.h | 3 --- 3 files changed, 41 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 612135dba5..0e86064ccb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3636,22 +3636,6 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en * @} */ -#if FF_API_TAG_STRING -/** - * Put a string representing the codec tag codec_tag in buf. - * - * @param buf buffer to place codec tag in - * @param buf_size size in bytes of buf - * @param codec_tag codec tag to assign - * @return the length of the string that would have been generated if - * enough space had been available, excluding the trailing null - * - * @deprecated see av_fourcc_make_string() and av_fourcc2str(). - */ -attribute_deprecated -size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag); -#endif - void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 25f69f59c6..643ea003df 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -453,28 +453,6 @@ const char *avcodec_get_name(enum AVCodecID id) return "unknown_codec"; } -#if FF_API_TAG_STRING -size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag) -{ - int i, len, ret = 0; - -#define TAG_PRINT(x) \ - (((x) >= '0' && (x) <= '9') || \ - ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') || \ - ((x) == '.' || (x) == ' ' || (x) == '-' || (x) == '_')) - - for (i = 0; i < 4; i++) { - len = snprintf(buf, buf_size, - TAG_PRINT(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF); - buf += len; - buf_size = buf_size > len ? buf_size - len : 0; - ret += len; - codec_tag >>= 8; - } - return ret; -} -#endif - const char *av_get_profile_name(const AVCodec *codec, int profile) { const AVProfile *p; diff --git a/libavcodec/version.h b/libavcodec/version.h index 87d54a4357..6d0f0f1d25 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_TAG_STRING -#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif