Changeset 0bad5052 in ffmpeg

Timestamp:

Jan 6, 2014, 11:39:36 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

21b25537

Parents:

ed1eb96 (diff), 63debaa7 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 23:38:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 23:39:36)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: libopusenc: Change default frame duration to 20 ms

See: 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)