Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/af_resample.c
Simple merge

diff --cc tests/fate/libavresample.mak
Simple merge