Changeset ac021fdc in ffmpeg

Timestamp:

Nov 26, 2013, 11:28:31 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8c87658

Parents:

0290a646 (diff), 56d061ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)