Changeset bcbd7dbc in ffmpeg

Timestamp:
Jun 3, 2014, 4:13:43 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
83e8650f
Parents:
40285d26 (diff), 68a06b3a (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:08:46)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/03/14 16:13:43)
Message:

Merge commit '68a06b3a639ee21c78532ee4c50c3366bf890ff7'

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

(No files)

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