Changeset dbf172e6 in ffmpeg

Timestamp:
Jun 12, 2015, 7:25:21 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d52c5e9d
Parents:
1189af42 (diff), f1fa1ee (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:14:34)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/15 19:25:21)
Message:

Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'

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

(No files)

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