Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:18:17 +0000 (01:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 23:23:22 +0000 (01:23 +0200)
* commit 'b2d45654220503224aa94e78cdff19ec624e9342':
  avresample: Add avresample_get_out_samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavresample/avresample.h
libavresample/utils.c
libavresample/version.h

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
Simple merge