Changeset 3d663574 in ffmpeg

Timestamp:
Jun 8, 2015, 8:56:51 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d5a64562
Parents:
77510a96 (diff), 6308cd48 (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/08/15 20:56:03)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/08/15 20:56:51)
Message:

Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'

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

(No files)

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