Changeset e9a47896 in ffmpeg

Timestamp:
Nov 28, 2013, 11:24:41 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a7f88177
Parents:
cb751a6a (diff), 25609b63 (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> (11/28/13 23:23:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/28/13 23:24:41)
Message:

Merge commit '25609b63d2e07d26d610f485a22082d32c96c0f5'

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

(No files)

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