Changeset 17c52d74 in ffmpeg

Timestamp:
Feb 22, 2015, 11:13:23 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
fab8b88a
Parents:
db4a2976 (diff), e2220e73 (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/22/15 23:13:19)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/22/15 23:13:23)
Message:

Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'

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

(No files)

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