It's no longer needed after the addition of av_frame_side_data_new_struct()
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavutil/mastering_display_metadata.c | 4 ++++
libavutil/mastering_display_metadata.h | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/libavutil/mastering_display_metadata.c
b/libavutil/mastering_display_metadata.c
index 4948f30523..48d8b04cc8 100644
--- a/libavutil/mastering_display_metadata.c
+++ b/libavutil/mastering_display_metadata.c
@@ -58,6 +58,7 @@ AVMasteringDisplayMetadata
*av_mastering_display_metadata_alloc_size(size_t *siz
return mastering;
}
+#if FF_API_CREATE_SIDE_DATA
AVMasteringDisplayMetadata
*av_mastering_display_metadata_create_side_data(AVFrame *frame)
{
AVFrameSideData *side_data = av_frame_new_side_data(frame,
@@ -71,6 +72,7 @@ AVMasteringDisplayMetadata
*av_mastering_display_metadata_create_side_data(AVFra
return (AVMasteringDisplayMetadata *)side_data->data;
}
+#endif
AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size)
{
@@ -82,6 +84,7 @@ AVContentLightMetadata
*av_content_light_metadata_alloc(size_t *size)
return metadata;
}
+#if FF_API_CREATE_SIDE_DATA
AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame
*frame)
{
AVFrameSideData *side_data = av_frame_new_side_data(frame,
@@ -94,3 +97,4 @@ AVContentLightMetadata
*av_content_light_metadata_create_side_data(AVFrame *fram
return (AVContentLightMetadata *)side_data->data;
}
+#endif
diff --git a/libavutil/mastering_display_metadata.h
b/libavutil/mastering_display_metadata.h
index 52fcef9e37..60ca817eff 100644
--- a/libavutil/mastering_display_metadata.h
+++ b/libavutil/mastering_display_metadata.h
@@ -21,8 +21,10 @@
#ifndef AVUTIL_MASTERING_DISPLAY_METADATA_H
#define AVUTIL_MASTERING_DISPLAY_METADATA_H
+#include "attributes.h"
#include "frame.h"
#include "rational.h"
+#include "version.h"
/**
@@ -86,14 +88,18 @@ AVMasteringDisplayMetadata
*av_mastering_display_metadata_alloc(void);
*/
AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t
*size);
+#if FF_API_CREATE_SIDE_DATA
/**
* Allocate a complete AVMasteringDisplayMetadata and add it to the frame.
*
* @param frame The frame which side data is added to.
*
+ * @deprecated use @ref av_frame_side_data_new_struct()
* @return The AVMasteringDisplayMetadata structure to be filled by caller.
*/
+attribute_deprecated
AVMasteringDisplayMetadata
*av_mastering_display_metadata_create_side_data(AVFrame *frame);
+#endif
/**
* Content light level needed by to transmit HDR over HDMI (CTA-861.3).
@@ -125,13 +131,17 @@ typedef struct AVContentLightMetadata {
*/
AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size);
+#if FF_API_CREATE_SIDE_DATA
/**
* Allocate a complete AVContentLightMetadata and add it to the frame.
*
* @param frame The frame which side data is added to.
*
+ * @deprecated use @ref av_frame_side_data_new_struct()
* @return The AVContentLightMetadata structure to be filled by caller.
*/
+attribute_deprecated
AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame
*frame);
+#endif
#endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
