Changeset df388836 in ffmpeg

Timestamp:
Feb 24, 2015, 9:55:55 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
29f9d82
Parents:
3804d73e (diff), 5956f48 (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 21:55:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 21:55:55)
Message:

Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'

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

(No files)

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