From patchwork Mon Jan 16 13:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038781pzb; Mon, 16 Jan 2023 05:42:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXuska9GJ0WBCfQ1sGnudqvMsWynAh/Y2UvxiDDeepto0eEMsC7q6ElmUgoQw4m9x77PPg0S X-Received: by 2002:a17:906:99d3:b0:870:23c5:8a81 with SMTP id s19-20020a17090699d300b0087023c58a81mr4799200ejn.41.1673876545991; Mon, 16 Jan 2023 05:42:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876545; cv=none; d=google.com; s=arc-20160816; b=KqPO9E/Dn1wXQJEm0ulilObHjfNQtoY85bYBQToYpduXEhJxu2fxLlxu/mdpidCcaZ quhTvXwPXq1ovJ0WkzOWfmHMGOYWoR8zraF+VkVfkBfC+EUaNsfMiEp4uUZ9ntpfXqyX 4seQeUVyg+qWyo0NpqTchcRD21x5Q3bkKwkbOg5VSS28tOkYfBJFzeQT+ujMCd+w8PbE cCA/lrqex55c5kLNYt9mU2Qpp/DXHjdbS+qrX9GPE5Izz90hc50FPuCp3dOqqtyZNxoN xezK7PAp1xdMKvsyAVJkmqYUV/SYgC8OIDNNaB2WOZlLXoAslIRt5E1w1gKWIe1H2+cP y27A== 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=q9m1Wr5CQMk5Z4gHUCFyQVVl6h4TLIhQOC+xZWT1cbc=; b=xu8badOfhd4AjvDt/JODr8R2HLYMNqvEpGUoUdTTVFlANlOemc3DalbArUvF6C6gv6 BQI+4kLLN33y9CjEsytyLRIZwVVH6f8mea083Sgb8z2YqAbh46oaBsAjzP4ud5p8UymO Tc5o2VG+I0kVt60BbeqbxiIgvcWKnzxHukTpwrpbW+eEtPeJ0hksWXYLu0KCZ3lYUQQH bLfFx8ipKMe2ZwiIry4B/jDzrY6k/DksvKgyTbUl128kiLWzLr4f3YRf0HmKhlcQB37C ykJR5rqNyGQjd88VKOQ0Zah+BsDMuA/F5IlvpkNKdFSnb086DjJRqGCSEiZlQBa/HUVA VnMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=a1WgRuHk; 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 un2-20020a170907cb8200b0084cbf555299si22756112ejc.954.2023.01.16.05.42.25; Mon, 16 Jan 2023 05:42:25 -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=a1WgRuHk; 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 D51EC68BE2C; Mon, 16 Jan 2023 15:39:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6FD868BDF8 for ; Mon, 16 Jan 2023 15:39:32 +0200 (EET) Received: by mail-ot1-f48.google.com with SMTP id x25-20020a056830115900b00670932eff32so16118351otq.3 for ; Mon, 16 Jan 2023 05:39:32 -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=ueP1EMV9tIIQ94364Y69qN5jQ8AtyygrtdX+6sTk64A=; b=a1WgRuHk+JTEYBPO246llOJK0IISenqtvNje5KwX2M69fMVUHtbZ65w3Zn7MeHxQ1I +BcSe5OGgziFrZbqf2SAIrAjJiV9Hy8r2+VQ64DJtRU4nx+iN/9tBJmhDaKt5mBYUzNM exEi/U1rBYLWvG6MwAM4bLASQ9SeH9xMZ2iXMeIrRu5rwy3hhgcUGL5n7+yMtCItwZzF qhppAVyVo0Tx3P4AzXc+9b1JgStMOPN/4ZzGipbm71y6OemxNehkMvl6DIAQxQA0doKL UuvdmuATOF+wam4/mvOdISEblOuMVdd4h98iSUTr4IZKh9uUZJJGmr2wlXZLTvS2jBmg HsTQ== 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=ueP1EMV9tIIQ94364Y69qN5jQ8AtyygrtdX+6sTk64A=; b=X0SgOvF4OzFTnT5v4fU7ZFJuQ6V9MESA7XYFIvObl8FGM734eD/zOfDSVX5BONDUPA bIMGGaPHkpBw9hH0dymdkemdSsWtRk4LioohBA56TmmfS8NJeWwS2G8rVZIbWb/p/Bm7 dBe0JpKYsBU3mYFTGMBlNiStyQWVb8n732Q/UUgsQTkZsXoaNuOadIWEqfF1PYvLSphT Y6DPLNyIhpoJ90Kb1Xd7CncNRlxu1viuwgx1vUCUZvRjpIIfD52nwE/pzLrAYpJex+EG jt8EsbR8+YT2HlHNgCcuri8E2L5kbToCYcTZVyl8WA62cqhmknaaX8hgcLT++z7qZHZO /k5w== X-Gm-Message-State: AFqh2kpr/MPdRV4AspqB7eZX9qQf6dLXU2eAYjs/iXRwsypAluEznnWQ 47nav32H/DDn0K/Casu6L3QpiAj6OHw= X-Received: by 2002:a05:6830:3889:b0:677:9043:7a43 with SMTP id bq9-20020a056830388900b0067790437a43mr51679489otb.11.1673876372220; Mon, 16 Jan 2023 05:39:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:35 -0300 Message-Id: <20230116133840.512-22-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 21/26] avutil: remove FF_API_COLORSPACE_NAME 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: OGcgErsI9ymd Signed-off-by: James Almer --- libavutil/frame.c | 17 ----------------- libavutil/frame.h | 9 --------- libavutil/version.h | 1 - 3 files changed, 27 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index fa9b11aa54..3198a50f67 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -35,23 +35,6 @@ av_get_channel_layout_nb_channels((frame)->channel_layout)) #endif -#if FF_API_COLORSPACE_NAME -const char *av_get_colorspace_name(enum AVColorSpace val) -{ - static const char * const name[] = { - [AVCOL_SPC_RGB] = "GBR", - [AVCOL_SPC_BT709] = "bt709", - [AVCOL_SPC_FCC] = "fcc", - [AVCOL_SPC_BT470BG] = "bt470bg", - [AVCOL_SPC_SMPTE170M] = "smpte170m", - [AVCOL_SPC_SMPTE240M] = "smpte240m", - [AVCOL_SPC_YCOCG] = "YCgCo", - }; - if ((unsigned)val >= FF_ARRAY_ELEMS(name)) - return NULL; - return name[val]; -} -#endif static void get_frame_defaults(AVFrame *frame) { memset(frame, 0, sizeof(*frame)); diff --git a/libavutil/frame.h b/libavutil/frame.h index bbe909ee2d..1172d013a3 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -720,15 +720,6 @@ typedef struct AVFrame { } AVFrame; -#if FF_API_COLORSPACE_NAME -/** - * Get the name of a colorspace. - * @return a static string identifying the colorspace; can be NULL. - * @deprecated use av_color_space_name() - */ -attribute_deprecated -const char *av_get_colorspace_name(enum AVColorSpace val); -#endif /** * Allocate an AVFrame and set its fields to default values. The resulting * struct must be freed using av_frame_free(). diff --git a/libavutil/version.h b/libavutil/version.h index 6014743947..700af5d874 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58)