Changeset 221a99aa in ffmpeg

Timestamp:
Aug 22, 2013, 11:09:24 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d68adbd6
Parents:
503aec14 (diff), 4622f11f (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> (08/22/13 11:09:00)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/22/13 11:09:24)
Message:

Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'

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

(No files)

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