Changeset 451469fd in ffmpeg

Timestamp:
Jun 12, 2014, 7:28:58 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6286bb5c
Parents:
ff0631ab (diff), 61a34491 (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/12/14 19:28:45)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/12/14 19:28:58)
Message:

Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

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

(No files)

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