Changeset 1aeddc3c in ffmpeg

Timestamp:
Jul 7, 2013, 8:54:39 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2adf8a9c
Parents:
dc2a13aa (diff), 8f689770 (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> (07/07/13 08:53:20)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/07/13 08:54:39)
Message:

Merge commit '8f689770548c86151071ef976cf9b6998ba21c2a'

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

(No files)

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