Changeset efcf8cfa in ffmpeg

Timestamp:

Jun 15, 2015, 7:41:20 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4ed3a01d

Parents:

a829040c (diff), 24ad3ac6 (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:31:09)

git-committer:

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

Message:

Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

• commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07': nut: Drop doxygen markers

Conflicts:

libavformat/nut.h

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

(No files)