Changeset 8e8276e0 in ffmpeg

Timestamp:
Mar 30, 2014, 11:32:02 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
36d37edf
Parents:
0f2588d7 (diff), 3e4e2142 (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/30/14 23:31:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/30/14 23:32:02)
Message:

Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

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

(No files)

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