Changeset 21d8e2c0 in ffmpeg

Timestamp:
Jun 10, 2015, 6:58:32 PM (9 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
11f86ec2
Parents:
d784d6b7 (diff), d1dd0d40 (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/10/15 18:58:26)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/10/15 18:58:32)
Message:

Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'

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

(No files)

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