Changeset 69b2d43 in ffmpeg

Timestamp:
Nov 11, 2014, 10:18:39 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
940f5c08
Parents:
70cbb473 (diff), 4cb9f1a7 (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/11/14 22:18:03)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/11/14 22:18:39)
Message:

Merge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'

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

(No files)

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