Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/hlsenc.c | 3 ---
libavformat/version_major.h | 1 -
2 files changed, 4 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 39df9becc7..32491b4534 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -3116,9 +3116,6 @@ static const AVOption options[] = {
{"hls_init_time", "set segment length at init list",
OFFSET(init_time), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, E},
{"hls_list_size", "set maximum number of playlist entries",
OFFSET(max_nb_segments), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E},
{"hls_delete_threshold", "set number of unreferenced segments to keep
before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 =
1}, 1, INT_MAX, E},
-#if FF_HLS_TS_OPTIONS
- {"hls_ts_options","set hls mpegts list of options for the container format
used for hls (deprecated, use hls_segment_options instead of it.)",
OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E |
AV_OPT_FLAG_DEPRECATED},
-#endif
{"hls_vtt_options","set hls vtt list of options for the container format
used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str =
NULL}, 0, 0, E},
{"hls_allow_cache", "explicitly set whether the client MAY (1) or MUST NOT
(0) cache media segments", OFFSET(allowcache), AV_OPT_TYPE_INT, {.i64 = -1},
INT_MIN, INT_MAX, E},
{"hls_base_url", "url to prepend to each playlist entry",
OFFSET(baseurl), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index 044af1ebf6..057d1ac0fb 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
*
*/
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
-#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60)
--
2.39.0
_______________________________________________
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".
