Changeset 2cf4d91c in ffmpeg

Timestamp:
Jun 11, 2014, 8:53:28 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
508e7a5c
Parents:
67911cc5 (diff), cd62c04d (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> (06/11/14 20:38:24)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/11/14 20:53:28)
Message:

Merge commit 'cd62c04d009b3baf7582556866a7029291b54573'

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

(No files)

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