Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 20:05:58 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Feb 2014 20:06:02 +0000 (21:06 +0100)
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
  lavr: add a function for checking whether AVAudioResampleContext is open

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