Changeset 946f080b in ffmpeg

Timestamp:
Aug 29, 2013, 2:05:04 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e1c3e62
Parents:
99e7c702 (diff), 7ffda66f (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> (08/29/13 14:05:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/29/13 14:05:04)
Message:

Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'

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

(No files)

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