Changeset 17a065cf in ffmpeg

Timestamp:
Oct 18, 2014, 11:52:06 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ec8f56ef
Parents:
74128352 (diff), 946f9535 (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> (10/18/14 11:51:59)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/18/14 11:52:06)
Message:

Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'

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

(No files)

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