From patchwork Sat Feb 4 10:41:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40262 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869726pzk; Sat, 4 Feb 2023 02:46:25 -0800 (PST) X-Google-Smtp-Source: AK7set8+f9Ud+GCb30xOqNtzaGayg7c1/O+ZEfI5m75qa0d5uGUHlht4pEp+uQFAIoy5QG6c+SOs X-Received: by 2002:a05:6402:4006:b0:4a2:71eb:b1e7 with SMTP id d6-20020a056402400600b004a271ebb1e7mr14072949eda.20.1675507584916; Sat, 04 Feb 2023 02:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507584; cv=none; d=google.com; s=arc-20160816; b=gZvUZ8+/Y1hf8I3hibEtHai0jOYiDdezbSQGhm4CQupwhbHhujDgl8SZFz/q3otnUo 2BgHt0Nhm4MKIMmTE+QeOwIfvBAks7NsvqYJQaDR5uZQXS4aOw85zytt5FQZb6ABuMHj 3dzcvl5Yse4kfUWSj9ays18B0VSG2xB/vM3jMjPuN1Py3yLc/EQbllOXwQchVHB9bvcr T6xJuj+ExcEMr2H9ihQ/zvKxO1oD48fau0OG/A4Z4W7GSIotZo8I0vtluJZontYMOZOm TEiNzx5nCjwVLZoAEcvvelE0d3htquYmRL/7ybHhqgsw5IofdT72x/U6OsqPlTXYQLtn C99w== 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:delivered-to; bh=aiSI3ijkeAuItjVOqYgax30iNgYJe0VPSP0AkDPJsFY=; b=hQA0AW0XM2jSsrKddd8DkIbCDD18PgXwB3L+j7hWpIsdZf67bVQvWbDf5Y4Oal9B6W gCuqdOxeca/dLU+X+brrngwtEX8/m3JnbO/Sg0l7SKCOXTXLo9id13J6dsskQKdaoflW maHVyyC8Lwh0sANQPsKxrPggTFJe3P5OIE1yiPIwxqlA8azQwPFBqYU0jjhxUBGJzNZW sSkbedrNpCI2v1S63xbIQoHryf68Ti6VhMkdKvhZ9Juk6zRgmSvoayjMY17xtIkUlwTR 2z1EQmbOwGRmR+fK4A+9Ek2AkWvig5RzI+IpATzdNFpIZzmlejrk+VODFIR4F31oWmHv WLhA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l18-20020a056402029200b0049d403fa2c5si5507137edv.181.2023.02.04.02.46.24; Sat, 04 Feb 2023 02:46:24 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4003168BF11; Sat, 4 Feb 2023 12:44:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79FEB68BE91 for ; Sat, 4 Feb 2023 12:44:17 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 36DB52404EE for ; Sat, 4 Feb 2023 11:44:17 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id mezUytQuK_io for ; Sat, 4 Feb 2023 11:44:15 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 24B46240D1D for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 562A73A0654 for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:58 +0100 Message-Id: <20230204104204.20721-28-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 27/33] 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: TvHAitU8V/in From: James Almer 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 fa9b11aa543..3198a50f67f 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 bbe909ee2da..1172d013a3d 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 6014743947c..700af5d8749 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)