Changeset 2a459f5d in ffmpeg

Timestamp:
Dec 13, 2013, 7:49:22 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1e3718e2
Parents:
7b2a19cb (diff), bdc111a1 (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:49:09)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/13/13 19:49:22)
Message:

Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'

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

(No files)

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