Changeset 9e0a1bd2 in ffmpeg

Timestamp:
Feb 16, 2015, 1:00:53 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
39b40be2
Parents:
9f179298 (diff), b16057b5 (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/16/15 01:00:49)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/16/15 01:00:53)
Message:

Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc'

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

(No files)

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