From 55af1807f7606225616e0a64a2142aa560232887 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 13 Sep 2020 13:25:05 +0200 Subject: [PATCH] avfilter/asrc_anullsrc: actually return correct EOF pts --- libavfilter/asrc_anullsrc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index dabdb43f184..f2c0799faa7 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -115,19 +115,14 @@ static int activate(AVFilterContext *ctx) if (ff_outlink_frame_wanted(outlink)) { AVFrame *samplesref = ff_get_audio_buffer(outlink, null->duration >= 0 ? FFMIN(null->nb_samples, null->duration - null->pts) : null->nb_samples); - int ret; if (!samplesref) return AVERROR(ENOMEM); samplesref->pts = null->pts; + null->pts += samplesref->nb_samples; - ret = ff_filter_frame(outlink, samplesref); - if (ret < 0) - return ret; - - null->pts += null->nb_samples; - return 0; + return ff_filter_frame(outlink, samplesref); } return FFERROR_NOT_READY; -- 2.39.2