Changeset 40285d26 in ffmpeg

Timestamp:
Jun 3, 2014, 4:03:19 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
bcbd7dbc
Parents:
ab9afcdf (diff), 6a0fa4d8 (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/03/14 16:03:15)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/03/14 16:03:19)
Message:

Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

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

(No files)

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