Changeset 97edb195 in ffmpeg

Timestamp:

May 1, 2014, 2:03:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6a3a7d7a

Parents:

82e4f398 (diff), 141fdc76 (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> (05/01/14 13:59:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/01/14 14:03:30)

Message:

Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

• commit '141fdc763c2841b572d29a2ad78513e8d5325870': matroska: add the Opus mapping

Conflicts:

libavformat/matroska.c

See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)