Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 18:54:38 +0000 (20:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 18:55:23 +0000 (20:55 +0200)
* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
  af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_resample.c
tests/fate/libavresample.mak

Simple merge
Simple merge