diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 12:28:31 +0100 |
| commit | ac021fdc40631f77a727f076f8748f89109c785b (patch) | |
| tree | a51ba691da5f29c81d3ea61848b2938236f88ec2 /doc/ffmpeg-formats.texi | |
| parent | 0290a646ac662a8552dfdb2de4887cac7a79acd1 (diff) | |
| parent | 56d061ce9da954560892e3551513d5ecc0439846 (diff) | |
| download | ffmpeg-ac021fdc40631f77a727f076f8748f89109c785b.tar.gz | |
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-formats.texi')
0 files changed, 0 insertions, 0 deletions