diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-21 10:15:44 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-24 08:00:57 +0100 |
| commit | a77beea6c8c168683f882aa71c63d69cafa1d5c7 (patch) | |
| tree | c8c1ec1e7c7d0bc3640708b149cd0de872c983fa | |
| parent | 54127cc427920e48921e05e328d9ce475ae9d38d (diff) | |
| download | ffmpeg-a77beea6c8c168683f882aa71c63d69cafa1d5c7.tar.gz | |
avutil/frame: Deprecate av_get_colorspace_name()
Contrary to av_color_space_name() it doesn't even support newer
colorspaces.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavutil/frame.c | 3 | ||||
| -rw-r--r-- | libavutil/frame.h | 5 | ||||
| -rw-r--r-- | 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..a5ed91b20a 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 /** * @} |