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)
commit82c0211213430a9aef0d6ef5b29de35043f5bcba
treec6b102b3756f9be53f28f6a0e078ed9d12861ac0
parent8dbc384f1527446b07eb6a673101f765e67f3eca
parent14758e3211d34a97c42b07acae117ce5627d7f57
Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

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