]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/asrc_anullsrc: actually return correct EOF pts
authorPaul B Mahol <onemda@gmail.com>
Sun, 13 Sep 2020 11:25:05 +0000 (13:25 +0200)
committerPaul B Mahol <onemda@gmail.com>
Sun, 13 Sep 2020 11:26:11 +0000 (13:26 +0200)
libavfilter/asrc_anullsrc.c

index dabdb43f1844711b319588447840c6bd1551bfde..f2c0799faa7b9dfebac6da9da5fbca6cc7354079 100644 (file)
@@ -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;