Changeset 12ca544a in ffmpeg

Timestamp:
Oct 14, 2013, 1:37:26 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
12e4493f
Parents:
953dd723 (diff), 15748773 (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/14/13 13:36:57)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/14/13 13:37:26)
Message:

Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'

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

(No files)

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