aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2024-01-20 12:39:15 -0300
committerJames Almer <jamrial@gmail.com>2024-03-07 08:53:30 -0300
commitb8fef7e9c520b3923b32813b6a82c154c74402dc (patch)
tree935d7d7e806877940651d817dd1da683e8616faa /libavfilter
parent4c92fc02f850f4f813e8cef8f8f8ed37d498e090 (diff)
downloadffmpeg-b8fef7e9c520b3923b32813b6a82c154c74402dc.tar.gz
avutil: remove deprecated FF_API_PKT_DURATION
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.c5
-rw-r--r--libavfilter/buffersrc.c7
-rw-r--r--libavfilter/vf_deshake_opencl.c7
-rw-r--r--libavfilter/vf_drawtext.c15
-rw-r--r--libavfilter/vsrc_testsrc.c5
5 files changed, 0 insertions, 39 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index daa7c3672a..0afc953375 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1039,11 +1039,6 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
frame->duration = av_rescale_q(frame->nb_samples, (AVRational){ 1, frame->sample_rate },
link->time_base);
-#if FF_API_PKT_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- frame->pkt_duration = frame->duration;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
li->frame_blocked_in = link->frame_wanted_out = 0;
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 98fa8b9dc8..ddcd403785 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -241,13 +241,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra
return AVERROR(ENOMEM);
}
-#if FF_API_PKT_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (copy->pkt_duration && copy->pkt_duration != copy->duration)
- copy->duration = copy->pkt_duration;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
if (copy->interlaced_frame)
diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c
index cddd5558e2..e49c808a8e 100644
--- a/libavfilter/vf_deshake_opencl.c
+++ b/libavfilter/vf_deshake_opencl.c
@@ -1412,13 +1412,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *input_frame)
&debug_matches, 1);
}
-#if FF_API_PKT_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- if (input_frame->pkt_duration) {
- duration = input_frame->pkt_duration;
- } else
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (input_frame->duration) {
duration = input_frame->duration;
} else {
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 904b2cf4bb..72629df2dc 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -104,9 +104,6 @@ static const char *const var_names[] = {
#if FF_API_FRAME_PKT
"pkt_pos",
#endif
-#if FF_API_PKT_DURATION
- "pkt_duration",
-#endif
#if FF_API_FRAME_PKT
"pkt_size",
#endif
@@ -155,9 +152,6 @@ enum var_name {
#if FF_API_FRAME_PKT
VAR_PKT_POS,
#endif
-#if FF_API_PKT_DURATION
- VAR_PKT_DURATION,
-#endif
#if FF_API_FRAME_PKT
VAR_PKT_SIZE,
#endif
@@ -1878,15 +1872,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
s->var_values[VAR_PKT_SIZE] = frame->pkt_size;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
-#if FF_API_PKT_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- s->var_values[VAR_PKT_DURATION] = frame->pkt_duration * av_q2d(inlink->time_base);
-
- if (frame->pkt_duration)
- s->var_values[VAR_DURATION] = frame->pkt_duration * av_q2d(inlink->time_base);
- else
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
s->var_values[VAR_DURATION] = frame->duration * av_q2d(inlink->time_base);
s->metadata = frame->metadata;
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index f27b2342ae..55c7e30ed6 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -202,11 +202,6 @@ static int activate(AVFilterContext *ctx)
return AVERROR(ENOMEM);
frame->pts = test->pts;
frame->duration = 1;
-#if FF_API_PKT_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- frame->key_frame = 1;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
frame->flags |= AV_FRAME_FLAG_KEY;
#if FF_API_INTERLACED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS