Changeset af75a855 in ffmpeg

Timestamp:
Jun 26, 2014, 7:03:21 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
c9083d85
Parents:
a9f79728 (diff), 3f4edf01 (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/26/14 19:01:18)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/26/14 19:03:21)
Message:

Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'

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

(No files)

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