diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:21:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:23:26 +0200 |
| commit | 75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12 (patch) | |
| tree | b92f4309b06f20e75e6cf741ea2f35b5f51bd6c9 /libavresample/audio_mix_matrix.c | |
| parent | e4fc7e3d4de96ba16582d2500f377ecdece28401 (diff) | |
| parent | 09fda6bb503dd9ac6ca963e308bdb86114df1294 (diff) | |
| download | ffmpeg-75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libmp3lame: add ABR support
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: d3211cfaedcc0abf30e3a40c246237090ad95b6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions