Changeset ae2a8d87 in ffmpeg

Timestamp:
Feb 24, 2015, 9:12:16 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a4f50ec9
Parents:
5d06b6e9 (diff), 247764a5 (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:12:13)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 21:12:16)
Message:

Merge commit '247764a592f83521f9c1ccdc900b00a8b84f3c87'

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

(No files)

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