Changeset b5c71fba in ffmpeg

Timestamp:
Jun 12, 2015, 7:05:57 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1189af42
Parents:
218f58a1 (diff), e7af52a6 (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:05:09)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:05:57)
Message:

Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.