diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:56:45 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:58:40 +0200 |
commit | db9c138616c9babc3a0f02c6b7289c774cc5b65c (patch) | |
tree | 773623f7aadf7b6f365b5024092c44489ed0affd /version.sh | |
parent | d5ec1ddf7bb0beb65319c749afc8fba2798a8ee1 (diff) | |
parent | 15fa856b82ea7dbbf69edc1074eb13dd00b0fa84 (diff) | |
download | ffmpeg-db9c138616c9babc3a0f02c6b7289c774cc5b65c.tar.gz |
Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'
* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
libfdk-aacenc: Enable 7.1 channel encoding
See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions