diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:54:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:54:08 +0100 |
| commit | 91043de8256fa87a0a20cc3a139f668110257dbe (patch) | |
| tree | c08d67dfa52db597b9b87bd74b304e6c03b8ade9 /libavresample/resample.h | |
| parent | 0dff771f31cffffec0e16944d3890564c2da16eb (diff) | |
| parent | 1647da89dd8ac09a55c111589f7a30d7e6b87d90 (diff) | |
| download | ffmpeg-91043de8256fa87a0a20cc3a139f668110257dbe.tar.gz | |
Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'
* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90':
lavr: make sure that the mix function is reset even if no mixing will be done
lavr: print out the mix matrix in ff_audio_mix_set_matrix()
ws-snd1: decode directly to the user-provided AVFrame
wmavoice: decode directly to the user-provided AVFrame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/resample.h')
0 files changed, 0 insertions, 0 deletions