Deprecated since 2023-03-17.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/dynamic_hdr_vivid.c | 11 ------
libavutil/hdr_dynamic_vivid_metadata.h | 54 --------------------------
libavutil/version.h | 1 -
3 files changed, 66 deletions(-)
diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c
index a9b6910798..319d13b90a 100644
--- a/libavcodec/dynamic_hdr_vivid.c
+++ b/libavcodec/dynamic_hdr_vivid.c
@@ -116,17 +116,6 @@ int
ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t
three_spline->th_delta2 =
(AVRational){get_bits(gb, 10), 1023};
three_spline->enable_strength =
(AVRational){get_bits(gb, 8), 255};
}
-#if FF_API_HDR_VIVID_THREE_SPLINE
- three_spline = &tm_params->three_spline[0];
-FF_DISABLE_DEPRECATION_WARNINGS
- tm_params->three_Spline_TH_mode =
three_spline->th_mode;
- tm_params->three_Spline_TH_enable_MB =
three_spline->th_enable_mb;
- tm_params->three_Spline_TH_enable =
three_spline->th_enable;
- tm_params->three_Spline_TH_Delta1 =
three_spline->th_delta1;
- tm_params->three_Spline_TH_Delta2 =
three_spline->th_delta2;
- tm_params->three_Spline_enable_Strength =
three_spline->enable_strength;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
}
}
diff --git a/libavutil/hdr_dynamic_vivid_metadata.h
b/libavutil/hdr_dynamic_vivid_metadata.h
index 4524a81557..a9d4797f0b 100644
--- a/libavutil/hdr_dynamic_vivid_metadata.h
+++ b/libavutil/hdr_dynamic_vivid_metadata.h
@@ -168,60 +168,6 @@ typedef struct AVHDRVividColorToneMappingParams {
*/
int three_Spline_num;
-#if FF_API_HDR_VIVID_THREE_SPLINE
- /**
- * The mode of three Spline. the value shall be in the range
- * of 0 to 3, inclusive.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- int three_Spline_TH_mode;
-
- /**
- * three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive
- * and in multiples of 1.0/255.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- AVRational three_Spline_TH_enable_MB;
-
- /**
- * 3Spline_TH_enable of three Spline.
- * The value shall be in the range of 0.0 to 1.0, inclusive.
- * and in multiples of 1.0/4095.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- AVRational three_Spline_TH_enable;
-
- /**
- * 3Spline_TH_Delta1 of three Spline.
- * The value shall be in the range of 0.0 to 0.25, inclusive,
- * and in multiples of 0.25/1023.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- AVRational three_Spline_TH_Delta1;
-
- /**
- * 3Spline_TH_Delta2 of three Spline.
- * The value shall be in the range of 0.0 to 0.25, inclusive,
- * and in multiples of 0.25/1023.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- AVRational three_Spline_TH_Delta2;
-
- /**
- * 3Spline_enable_Strength of three Spline.
- * The value shall be in the range of 0.0 to 1.0, inclusive,
- * and in multiples of 1.0/255.
- * @deprecated Use three_spline instead
- */
- attribute_deprecated
- AVRational three_Spline_enable_Strength;
-#endif
-
AVHDRVivid3SplineParams three_spline[2];
} AVHDRVividColorToneMappingParams;
diff --git a/libavutil/version.h b/libavutil/version.h
index ee4a36cb17..4c8282a35c 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -105,7 +105,6 @@
* @{
*/
-#define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 60)
#define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 60)
#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60)
#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)
--
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".
