Changeset 40fc1e2d in ffmpeg

Timestamp:
Feb 4, 2014, 2:09:02 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5144d919
Parents:
cddbe9fa (diff), 5de64bb3 (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/04/14 14:08:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/04/14 14:09:02)
Message:

Merge commit '5de64bb34d68d6c224dca90003172d7a27958825'

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

(No files)

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