Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:24:26 +0000 (01:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:24:48 +0000 (01:24 +0200)
commit20343cfb51ea234500ce9c9c39b79287f44de4f7
tree2302b11983f7124e033685168714b9c65773b49f
parentbdb2e80e88e76cc39c6d85a8f1c1712d36e18966
parentad0fe2f4012031c47268f14b9835088c488e1998
Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'

* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
  af_resample: Use avresample_get_out_samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_resample.c