Changeset 2d2c744f in ffmpeg

Timestamp:
Feb 15, 2015, 8:03:47 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a848cf63
Parents:
8f00d7f4 (diff), f0a87479 (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> (02/15/15 20:03:43)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/15/15 20:03:47)
Message:

Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'

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

(No files)

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