Changeset 5b93b272 in ffmpeg

Timestamp:
Jan 21, 2014, 2:31:04 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
58f437c3
Parents:
c7b454f (diff), 838740e6 (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/21/14 14:30:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/21/14 14:31:04)
Message:

Merge commit '838740e6420538ad45982da6b1d3aa3ae91307f5'

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

(No files)

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