Changeset 08f229d8 in ffmpeg

Timestamp:
May 31, 2015, 7:48:16 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ff199543
Parents:
e8676c75 (diff), 7014b659 (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> (05/31/15 19:48:06)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/31/15 19:48:16)
Message:

Merge commit '7014b65995b1fe6188fb53447bf61b08e3963355'

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

(No files)

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