Changeset 9ace1541 in ffmpeg

Timestamp:
Jan 13, 2014, 1:36:55 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ececbeda
Parents:
a067445b (diff), 99e20125 (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> (01/13/14 13:36:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/13/14 13:36:55)
Message:

Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

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

(No files)

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