Changeset 94194bdc in ffmpeg

Timestamp:
Nov 23, 2013, 12:45:09 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
62e10c37
Parents:
2cbf27b0 (diff), d4df0213 (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/23/13 12:45:04)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/23/13 12:45:09)
Message:

Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'

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

(No files)

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