@@ -42,6 +42,7 @@ typedef struct ResampleContext {

     AVDictionary *options;

     int64_t next_pts;

+    int64_t next_in_pts;

     /* set by filter_frame() to signal an output frame to request_frame() */

     int got_output;

@@ -154,6 +155,7 @@ static int config_output(AVFilterLink *outlink)

     outlink->time_base = (AVRational){ 1, outlink->sample_rate };

     s->next_pts        = AV_NOPTS_VALUE;

+    s->next_in_pts     = AV_NOPTS_VALUE;

     av_get_channel_layout_string(buf1, sizeof(buf1),

                                  -1, inlink ->channel_layout);

@@ -255,7 +257,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)

             }

             out->sample_rate = outlink->sample_rate;

-            if (in->pts != AV_NOPTS_VALUE) {

+            /* Only convert in->pts if there is a discontinuous jump.

+               This ensures that out->pts tracks the number of samples actually

+               output by the resampler in the absence of such a jump.

+               Otherwise, the rounding in av_rescale_q() and av_rescale()

+               causes off-by-1 errors. */

+            if (in->pts != AV_NOPTS_VALUE && in->pts != s->next_in_pts) {

                 out->pts = av_rescale_q(in->pts, inlink->time_base,

                                             outlink->time_base) -

                                av_rescale(delay, outlink->sample_rate,

@@ -264,6 +271,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)

                 out->pts = s->next_pts;

             s->next_pts = out->pts + out->nb_samples;

+            s->next_in_pts = in->pts + in->nb_samples;

             ret = ff_filter_frame(outlink, out);

             s->got_output = 1;