Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
  af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-21 20:54:38 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -201,6 +201,7 @@ static int request_frame(AVFilterLink *outlink)
return (ret == 0) ? AVERROR_EOF : ret;
}
frame->nb_samples = ret;
frame->pts = s->next_pts;
return ff_filter_frame(outlink, frame);
}