Changeset 767e171c in ffmpeg

Timestamp:
Jun 25, 2013, 9:34:14 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
876e960d
Parents:
7efcd531 (diff), 9f4a16c5 (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/25/13 09:34:08)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/25/13 09:34:14)
Message:

Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'

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

(No files)

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