diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-07-11 10:31:47 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-07-19 12:27:17 +0200 |
| commit | 357ba45a5ca3864b0eba07747ab6ea1614f2646b (patch) | |
| tree | bfc0cb60694b7e44535d29aa21413f506ad8b149 /libavfilter/vf_drawtext.c | |
| parent | ac2cda4296dbbaf2580ec3aa404bb2f3a393159c (diff) | |
| download | ffmpeg-357ba45a5ca3864b0eba07747ab6ea1614f2646b.tar.gz | |
lavfi: use AVFrame.duration instead of AVFrame.pkt_duration
Diffstat (limited to 'libavfilter/vf_drawtext.c')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index feb6898848..50012bb258 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -91,8 +91,11 @@ static const char *const var_names[] = { "y", "pict_type", "pkt_pos", +#if FF_API_PKT_DURATION "pkt_duration", +#endif "pkt_size", + "duration", NULL }; @@ -131,8 +134,11 @@ enum var_name { VAR_Y, VAR_PICT_TYPE, VAR_PKT_POS, +#if FF_API_PKT_DURATION VAR_PKT_DURATION, +#endif VAR_PKT_SIZE, + VAR_DURATION, VAR_VARS_NB }; @@ -1649,8 +1655,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->var_values[VAR_PICT_TYPE] = frame->pict_type; s->var_values[VAR_PKT_POS] = frame->pkt_pos; +#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->var_values[VAR_PKT_SIZE] = frame->pkt_size; + s->metadata = frame->metadata; for (int i = 0; i < loop; i++) { |