Changeset 8263c146 in ffmpeg

Timestamp:
Mar 19, 2014, 7:46:52 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3e59db60
Parents:
bd9e0127 (diff), 842ea36c (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> (03/19/14 19:46:08)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/19/14 19:46:52)
Message:

Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'

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

(No files)

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