Changeset 7c521d45 in ffmpeg

Timestamp:
Apr 14, 2015, 11:28:29 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6e86ee97
Parents:
2051b401 (diff), 2de76504 (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> (04/14/15 11:28:19)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/14/15 11:28:29)
Message:

Merge commit '2de7650451d90520135d8cf6f96caa0658824208'

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

(No files)

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