[FFmpeg-cvslog] Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 10:31:49 2012 +0100| [82c0211213430a9aef0d6ef5b29de35043f5bcba] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82c0211213430a9aef0d6ef5b29de35043f5bcba
---