Changeset 236874a5 in ffmpeg

Timestamp:
Mar 14, 2014, 12:25:19 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
27cab16c
Parents:
925ce6fa (diff), 4cb4680c (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> (03/14/14 00:25:06)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/14/14 00:25:19)
Message:

Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8'

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

(No files)

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