aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/dashenc.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 17:14:23 +0100
committerJames Almer <jamrial@gmail.com>2021-04-27 10:43:09 -0300
commite5bcda6473a2d6984216004506374669501fcf3b (patch)
treef9e6610a6a3c4d80ecd98b93c2bbc31626a45d49 /libavformat/dashenc.c
parent6f34f031908b8f16482e951ee5232116fb42b46a (diff)
downloadffmpeg-e5bcda6473a2d6984216004506374669501fcf3b.tar.gz
avformat/dashenc: Remove deprecated min_seg_duration option
Deprecated in 01ba52852d2ada3c79fe02a7de5bc1fdc27d56e8. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/dashenc.c')
-rw-r--r--libavformat/dashenc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 81a5c2b452..a73fa60d2a 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -147,9 +147,6 @@ typedef struct DASHContext {
int nb_as;
int window_size;
int extra_window_size;
-#if FF_API_DASH_MIN_SEG_DURATION
- int min_seg_duration;
-#endif
int64_t seg_duration;
int64_t frag_duration;
int remove_at_exit;
@@ -1374,12 +1371,6 @@ static int dash_init(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "At least one profile must be enabled.\n");
return AVERROR(EINVAL);
}
-#if FF_API_DASH_MIN_SEG_DURATION
- if (c->min_seg_duration != 5000000) {
- av_log(s, AV_LOG_WARNING, "The min_seg_duration option is deprecated and will be removed. Please use the -seg_duration\n");
- c->seg_duration = c->min_seg_duration;
- }
-#endif
if (c->lhls && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(s, AV_LOG_ERROR,
"LHLS is experimental, Please set -strict experimental in order to enable it.\n");
@@ -2340,9 +2331,6 @@ static const AVOption options[] = {
{ "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
{ "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E },
{ "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E },
-#if FF_API_DASH_MIN_SEG_DURATION
- { "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E },
-#endif
{ "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E },
{ "frag_duration", "fragment duration (in seconds, fractional value can be set)", OFFSET(frag_duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E },
{ "frag_type", "set type of interval for fragments", OFFSET(frag_type), AV_OPT_TYPE_INT, {.i64 = FRAG_TYPE_NONE }, 0, FRAG_TYPE_NB - 1, E, "frag_type"},