Changeset c985966 in ffmpeg

Timestamp:
Oct 28, 2013, 10:32:22 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d57a6fe6
Parents:
f0e43e60 (diff), de606120 (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> (10/28/13 10:32:16)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/28/13 10:32:22)
Message:

Merge commit 'de6061203e2d509579ab110fb1873aade34320f5'

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

(No files)

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