[FFmpeg-cvslog] Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
Michael Niedermayer
git at videolan.org
Tue Nov 26 12:34:07 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 26 12:28:31 2013 +0100| [ac021fdc40631f77a727f076f8748f89109c785b] | committer: Michael Niedermayer
Merge commit '56d061ce9da954560892e3551513d5ecc0439846'
* commit '56d061ce9da954560892e3551513d5ecc0439846':
metasound: add last missing modes (8kHz @ 6kbps per channel)
Conflicts:
Changelog
doc/general.texi
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac021fdc40631f77a727f076f8748f89109c785b
---
More information about the ffmpeg-cvslog
mailing list