Changeset 85d0df0c in ffmpeg

Timestamp:

Jun 12, 2015, 7:42:50 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b68b5ec

Parents:

d52c5e9d (diff), 64a2e844 (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/12/15 19:42:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:42:50)

Message:

Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'

• commit '64a2e844166d62093b45e680874eea8bd1facf5b': eamad: Use the correct headers

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

(No files)