Changeset d1fa6718 in ffmpeg

Timestamp:
Jul 2, 2013, 9:40:44 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
951a3655
Parents:
bc62b24d (diff), c8b920a9 (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/02/13 09:40:38)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/02/13 09:40:44)
Message:

Merge commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'

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

(No files)

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