[FFmpeg-devel] [PATCH v2 27/33] avutil: remove FF_API_COLORSPACE_NAME

[Anton Khirnov]

From: James Almer <jamrial at gmail.com>

Signed-off-by: James Almer <jamrial at gmail.com>
---
 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)
-- 
2.35.1