Changeset 7b2a19cb in ffmpeg

Timestamp:
Dec 13, 2013, 7:39:45 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2a459f5d
Parents:
782d48c (diff), a1d7d552 (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> (12/13/13 19:34:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/13/13 19:39:45)
Message:

Merge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'

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

(No files)

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