From patchwork Mon Jan 16 13:38:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038657pzb; Mon, 16 Jan 2023 05:42:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXtgUdbZ7OWJzVAZ0IWgWUVUwQFdfR+hye7URM50NNTkFi1a0VYFbqD5hIE1GVP2nhBL3/it X-Received: by 2002:a17:906:9f20:b0:84d:43a0:7090 with SMTP id fy32-20020a1709069f2000b0084d43a07090mr25513060ejc.77.1673876530817; Mon, 16 Jan 2023 05:42:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876530; cv=none; d=google.com; s=arc-20160816; b=t9pdIugn+udKbfpjLBqjbv5p9qClJpAOEc+sL5cUsczfDTiTEkVcUxIHaquckq9iyN EPCvLj0PJLNEQpOs6sFF/bRF/1yvREF+4wrNsDI4WD5GKFImKKt+1tSVX4qGpC+xbjpK o0s5VboAIi6o1FeLDHXsixrtGro+G3+EqIxEkHWHWL41inqYBjD7OJb1WpYRh85/xUP/ rIxBFTnpSw60RtwGJ52fYI0mq4HoEqG1RrUXc3CzO+WvjRwASdsnc/TZI2ZHzgzVyqGN xEeLgfzRR9PXSmk1lCAf4jbp21bs380HthmIo/CyCxvVLGC9n+DteZJLD24pDCRW5zbe L1vw== 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=ry5q+r7Vp3OxpRTN3Gql/JZ5WGVHuyrhlH0aQmEPpa8=; b=oaTfA+P5kwQNgSfn03jnxmjklxqMbpw9iBAkvCig6lDXRpyLEwHJu0d01NAU1OI4eZ rlpQsaRXGMr/8ITUb8YUmjoCGw5lFQmHcjnJIAK8E66QjWePeCOdi5Zf5n0IVy3cP8C3 19GFQ0omrhseO+zPLBiSI5LxdK/Os3kQlKIYdAxigcXdRwrIIIcN5RRz13rKZMrnSNgS iEl9/7jfU5rNcZC8/9O7ZMO+JjlSvqkNWSifzBisEYpfhJHk/B1GZqzqdyjoOXq9C2g/ Q12sYUBfbo51Y4KbQuy3oBREnRUEGShGgWpXaPfcn6Wsthg2pkqE3SF+nWXWvaAa/qce aTHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BkBdbMRk; 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 go20-20020a1709070d9400b00855da26bccasi6691232ejc.974.2023.01.16.05.42.09; Mon, 16 Jan 2023 05:42:10 -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=BkBdbMRk; 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 0764268BDF3; Mon, 16 Jan 2023 15:39:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 967E968BE09 for ; Mon, 16 Jan 2023 15:39:31 +0200 (EET) Received: by mail-ot1-f44.google.com with SMTP id v15-20020a9d69cf000000b006709b5a534aso16106919oto.11 for ; Mon, 16 Jan 2023 05:39:31 -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=9GBHKZEO6OF9bDM0VRbKRGT4XinukV4DpaJEECaY8n0=; b=BkBdbMRkkuXocfomWfaw5pf+dt0cM1DH80QnOtADXx3XD2LXTI6PL1Lo94eZWHsZqi AYnUqb+vMmhhpfqdvQvff7+K3Fynvuc1LlTHdgGI43Fect6HvYjGFhzf/iI8nEFcaNTG Q8uujAbdfoQtKzRpiPQBwwNZvIFPPUaHBehA7LU3rjqyt2mZ7RI0jqusEZcBZ5LrYbth 1xO6KaGB/v3n50AaphHez60R4/rvXs5dU5OeSpi+xYAtE+PHskiqvn3hG3zYNlRhRLm/ ji5SQ9pRoVAMbhTlPClde/7rlAK6iYn7dqiYQ0yocfqqOvLPnhKuTn6LaSgI/EIpVRvi p1cQ== 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=9GBHKZEO6OF9bDM0VRbKRGT4XinukV4DpaJEECaY8n0=; b=t3J86Zt57ejK+844pAuM/ma+bJWhSef0YP3aWr6OTqXpT+mnXysQ8DfKhsH90yST4E 3weW3hxzBjQpiH1Wdpmu9RTE1LfcqJMAh2cysjVVErA3zPesWto6qxJnZicqVU33bkgE h+1PAzClFnylV7gzRg48dOWBBnGHOyGw6yIZXeRlkOma2n2WGP1gjz/2fqWKcYH0Fcw5 46U9GKLNANVLVWTUtfsa95f+PfHaZp36yReE0RByJ3QpIsmRiDSYNndGKmkZS+blYNk3 8dDyCyCtovWibdbRRRo6+sHkq95waBALV5yNCIUajKJqhmKN+TA+N06QszpWAM0pOXk3 24+A== X-Gm-Message-State: AFqh2koYBjqLgpovtnrUdBvViTTZp5Pv26JHaHidUZ0yJk+xHsWBBkDF TcGK1tID24P8qd0jmnsTG+Kb/1EcxPg= X-Received: by 2002:a9d:73ca:0:b0:670:5da6:7f02 with SMTP id m10-20020a9d73ca000000b006705da67f02mr50409938otk.33.1673876369986; Mon, 16 Jan 2023 05:39:29 -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.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:29 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:33 -0300 Message-Id: <20230116133840.512-20-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 19/26] avutil: remove FF_API_D2STR 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: HWJcyWb+YkfC Signed-off-by: James Almer --- libavutil/avstring.c | 10 ---------- libavutil/avstring.h | 9 --------- libavutil/tests/avstring.c | 16 ---------------- libavutil/version.h | 1 - 4 files changed, 36 deletions(-) diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 5ddbe9219e..e460b5be7f 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -139,16 +139,6 @@ end: return p; } -#if FF_API_D2STR -char *av_d2str(double d) -{ - char *str = av_malloc(16); - if (str) - snprintf(str, 16, "%f", d); - return str; -} -#endif - #define WHITESPACES " \n\t\r" char *av_get_token(const char **buf, const char *term) diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 74aa4cd0e4..e260263763 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -157,15 +157,6 @@ static inline size_t av_strnlen(const char *s, size_t len) */ char *av_asprintf(const char *fmt, ...) av_printf_format(1, 2); -#if FF_API_D2STR -/** - * Convert a number to an av_malloced string. - * @deprecated use av_asprintf() with "%f" or a more specific format - */ -attribute_deprecated -char *av_d2str(double d); -#endif - /** * Unescape the given string until a non escaped terminating char, * and return the token corresponding to the unescaped string. diff --git a/libavutil/tests/avstring.c b/libavutil/tests/avstring.c index 37a2cf1833..bc0bde358d 100644 --- a/libavutil/tests/avstring.c +++ b/libavutil/tests/avstring.c @@ -109,21 +109,5 @@ int main(void) TEST_STRIREPLACE(haystack, needle [2], "Education consists mainly in what we have instead."); TEST_STRIREPLACE(haystack, needle [1], "Education consists mainly in what we have instead"); -#if FF_API_D2STR -FF_DISABLE_DEPRECATION_WARNINGS - /*Testing av_d2str()*/ - #define TEST_D2STR(value, expected) \ - if((ptr = av_d2str(value)) == NULL){ \ - printf("error, received null pointer!\n"); \ - } else { \ - if(strcmp(ptr, expected) != 0) \ - printf( "expected: %s, received: %s\n", expected, ptr); \ - av_free(ptr); \ - } - TEST_D2STR(0 , "0.000000"); - TEST_D2STR(-1.2333234, "-1.233323"); - TEST_D2STR(-1.2333237, "-1.233324"); -FF_ENABLE_DEPRECATION_WARNINGS -#endif return 0; } diff --git a/libavutil/version.h b/libavutil/version.h index 60f96af5df..38769962cc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58)