Changeset c5fc48fd in ffmpeg

Timestamp:

Jun 15, 2015, 7:18:13 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e6c71385

Parents:

8ce321f0 (diff), 07b2db81 (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> (06/15/15 19:09:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/15/15 19:18:13)

Message:

Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'

• commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0': riff: Add MNM4 FourCC as mpeg4

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

(No files)