diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:31:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:31:56 +0100 |
| commit | 82c0211213430a9aef0d6ef5b29de35043f5bcba (patch) | |
| tree | c6b102b3756f9be53f28f6a0e078ed9d12861ac0 /libavcodec/wmv2dec.c | |
| parent | 8dbc384f1527446b07eb6a673101f765e67f3eca (diff) | |
| parent | 14758e3211d34a97c42b07acae117ce5627d7f57 (diff) | |
| download | ffmpeg-82c0211213430a9aef0d6ef5b29de35043f5bcba.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmv2dec.c')
0 files changed, 0 insertions, 0 deletions