Changeset c686cf2 in ffmpeg

Timestamp:
Mar 14, 2014, 12:42:47 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2b02c1a6
Parents:
0f958568 (diff), 14efbe6 (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/14/14 00:42:42)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/14/14 00:42:47)
Message:

Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf'

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

(No files)

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