Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:31:49 +0000 (10:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:31:56 +0000 (10:31 +0100)
* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/utils.c

Simple merge