avutil/frame: Deprecate av_get_colorspace_name()

Contrary to av_color_space_name() it doesn't even support newer colorspaces.

Andreas Rheinhardt committed 5 years ago

Commit a77beea1 parent 54127cc4 files · +14 −3Browse files

Unified · Split

4 files

doc/APIchanges +4 −0
libavutil/frame.c +2 −1
libavutil/frame.h +4 −1
libavutil/version.h +4 −1

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2017-10-21 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2021-03-21 - xxxxxxxxxx - lavu 56.72.100 - frame.h
	19	+ Deprecated av_get_colorspace_name().
	20	+ Use av_color_space_name() instead.
	21	+
18	22	-------- 8< --------- FFmpeg 4.4 was cut here -------- 8< ---------
19	23
20	24	2021-03-19 - e8c0bca6bd - lavu 56.69.100 - adler32.h

libavutil/frame.c+2−1

@@ -120,6 +120,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 119 unmodified lines
120	120	}
121	121	#endif
122	122
	123	+#if FF_API_COLORSPACE_NAME
123	124	const char *av_get_colorspace_name(enum AVColorSpace val)
124	125	{
125	126	static const char * const name[] = {
@@ -135,7 +136,7 @@ const char *av_get_colorspace_name(enum AVColorSpace val) · 9 unmodified lines
135	136	return NULL;
136	137	return name[val];
137	138	}
138		−
	139	+#endif
139	140	static void get_frame_defaults(AVFrame *frame)
140	141	{
141	142	if (frame->extended_data != frame->data)

libavutil/frame.h+4−1

@@ -754,12 +754,15 @@ attribute_deprecated · 753 unmodified lines
754	754	void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
755	755	#endif
756	756
	757	+#if FF_API_COLORSPACE_NAME
757	758	/**
758	759	* Get the name of a colorspace.
759	760	* @return a static string identifying the colorspace; can be NULL.
	761	+ * @deprecated use av_color_space_name()
760	762	*/
	763	+attribute_deprecated
761	764	const char *av_get_colorspace_name(enum AVColorSpace val);
762		−
	765	+#endif
763	766	/**
764	767	* Allocate an AVFrame and set its fields to default values. The resulting
765	768	* struct must be freed using av_frame_free().

libavutil/version.h+4−1

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	79	*/
80	80
81	81	#define LIBAVUTIL_VERSION_MAJOR 56
82		−#define LIBAVUTIL_VERSION_MINOR 71
	82	+#define LIBAVUTIL_VERSION_MINOR 72
83	83	#define LIBAVUTIL_VERSION_MICRO 100
84	84
85	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -141,6 +141,9 @@ · 55 unmodified lines
141	141	#ifndef FF_API_DECLARE_ALIGNED
142	142	#define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58)
143	143	#endif
	144	+#ifndef FF_API_COLORSPACE_NAME
	145	+#define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58)
	146	+#endif
144	147
145	148	/**
146	149	* @}