Changeset 64f58d20 in ffmpeg

Timestamp:
Feb 24, 2015, 11:17:48 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
fa80b76b
Parents:
f966ac2b (diff), f4b59334 (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> (02/24/15 23:17:44)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 23:17:48)
Message:

Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'

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

(No files)

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