Changeset 7766c7b7 in ffmpeg

Timestamp:

Jan 14, 2014, 1:38:10 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b148a39

Parents:

194ef56b (diff), 7151c5d0 (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/14/14 13:38:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/14/14 13:38:10)

Message:

Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

• commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49': arm: Use full filenames as multiple inclusion guards

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

(No files)