eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavfi: use AVFrame.duration instead of AVFrame.pkt_duration

Browse Source
This commit is contained in:
Anton Khirnov
2022-07-11 10:31:47 +02:00
parent ac2cda4296
commit 357ba45a5c
5 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/f_loop.c
View File

@@ -331,9 +331,16 @@ static int push_frame(AVFilterContext *ctx)
if (!out)
return AVERROR(ENOMEM);
out->pts += s->duration - s->start_pts;
#if FF_API_PKT_DURATION
FF_DISABLE_DEPRECATION_WARNINGS
if (out->pkt_duration)
duration = out->pkt_duration;
else
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (out->duration)
duration = out->duration;
else
duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base);
pts = out->pts + duration;
ret = ff_filter_frame(outlink, out);
@@ -368,9 +375,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
return AVERROR(ENOMEM);
}
s->nb_frames++;
#if FF_API_PKT_DURATION
FF_DISABLE_DEPRECATION_WARNINGS
if (frame->pkt_duration)
duration = frame->pkt_duration;
else
FF_ENABLE_DEPRECATION_WARNINGS
#endif
if (frame->duration)
duration = frame->duration;
else
duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base);
s->duration = frame->pts + duration;
ret = ff_filter_frame(outlink, frame);