From patchwork Sun Mar 21 09:47:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26515 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4A8CC449A95 for ; Sun, 21 Mar 2021 11:48:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3492368AA07; Sun, 21 Mar 2021 11:48:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D70D868A862 for ; Sun, 21 Mar 2021 11:47:56 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id 12so7790823wmf.5 for ; Sun, 21 Mar 2021 02:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=WvGVxg8hof3HVadB+YiQAQunA40G7cih0aUiegeIxJM=; b=SloVbTWd4oHjXw+G8RquSbaJMyaKyk4ZNVR+taL0ewwnb5xz8Mr1l6fstfItbWsWMk 4Hdzye4nmyEyxWc6B00DKDhKfh+eCqm7uUATfwjwb6MGPcLx/84m8Uz5hH2XRxwN1wwh +LKw2uWpBf14QOyS3aGUtepdyzWCZ7LMae1ShSR0/fzSCNtO2VboNEPWHVqZYxGwCXkR fEozUn0k7eNJLAJPu2Bw2vEAN/lNYQtSLiNg3Ht/IHQH192cfRz3MAaxRTr4HdaHR9tc 1hXJeDBCh1Q8Paqr30HpAbsC10iIjYwSDoY/bDTcEQ0LP7nCpuqcydbGjMi9+o6B3quJ gqDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=WvGVxg8hof3HVadB+YiQAQunA40G7cih0aUiegeIxJM=; b=lCBoKgxhMhzGFIMWkfFldI+d73bKCrPeC7Q00Ufdv5U+BuWPOXfdAqFYEZo3T5MHSB CP5UMN3W3AP1rLhicl5+xxLaZ084CAUA/ZpqT01Hh3AmfZeN+wSqXh1sahaUhYrGGxZ0 2e2jkAb29YY81e68x/wAs1Mejbv14DyobyFwfg9w5j1wjcV3s2ydi9VcyT+f6CF2fOHz yYKPjDRZrq9l9J2J7elkg/jyyT9rVqZkoy0fzrXuf3RLTyfqa+pEEo2qd6m1KgmOAgnC e76Zx2XxbROBCwP06hwmIV1K3qCqS0B3owuOEn3q6yOl0mjGV6XPJSuq5gRZYnDpU260 92xg== X-Gm-Message-State: AOAM5303gydJBkBjuXmvJ2nSRI7akqkFclBbRFskbTztIVrd2QThEPgN J8w/J+yJgQOpOZUdbwqkWHeZ1BfYpivNdg== X-Google-Smtp-Source: ABdhPJyS2PaoCoIXQSiRLz8j0+ygg7MC3Le+OluRyYoeU5C560rpc5lO3KM5ZRzUznI0KR618P6ILw== X-Received: by 2002:a7b:c35a:: with SMTP id l26mr11211815wmj.104.1616320076165; Sun, 21 Mar 2021 02:47:56 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id m14sm11649387wmi.27.2021.03.21.02.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 02:47:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Mar 2021 10:47:22 +0100 Message-Id: <20210321094722.447294-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210321094722.447294-1-andreas.rheinhardt@gmail.com> References: <20210321094722.447294-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avutil/frame: Deprecate av_get_colorspace_name() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Contrary to av_color_space_name() it doesn't even support newer colorspaces. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 4 ++++ libavutil/frame.c | 3 ++- libavutil/frame.h | 5 ++++- libavutil/version.h | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index c928887f79..b41dadee8d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-03-21 - xxxxxxxxxx - lavu 56.72.100 - frame.h + Deprecated av_get_colorspace_name(). + Use av_color_space_name() instead. + -------- 8< --------- FFmpeg 4.4 was cut here -------- 8< --------- 2021-03-19 - e8c0bca6bd - lavu 56.69.100 - adler32.h diff --git a/libavutil/frame.c b/libavutil/frame.c index 75e347bf2f..31a2117b82 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -120,6 +120,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } #endif +#if FF_API_COLORSPACE_NAME const char *av_get_colorspace_name(enum AVColorSpace val) { static const char * const name[] = { @@ -135,7 +136,7 @@ const char *av_get_colorspace_name(enum AVColorSpace val) return NULL; return name[val]; } - +#endif static void get_frame_defaults(AVFrame *frame) { if (frame->extended_data != frame->data) diff --git a/libavutil/frame.h b/libavutil/frame.h index 7d1f8e2935..c24d52d1c6 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -754,12 +754,15 @@ attribute_deprecated void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); #endif +#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 55072f8246..e88e1ad08d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 71 +#define LIBAVUTIL_VERSION_MINOR 72 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -141,6 +141,9 @@ #ifndef FF_API_DECLARE_ALIGNED #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) #endif +#ifndef FF_API_COLORSPACE_NAME +#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) +#endif /** * @}