Changeset e1ec9c7f in ffmpeg

Timestamp:
Jun 12, 2015, 8:46:10 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
00ebf89d
Parents:
6cfaa51a (diff), 30dfc1da (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 20:45:53)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/15 20:46:10)
Message:

Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'

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

(No files)

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