Changeset 2e15f07c in ffmpeg

Timestamp:
May 29, 2015, 10:59:57 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
dae89802
Parents:
f24d92ba (diff), b2f0f37 (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> (05/29/15 22:59:54)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/29/15 22:59:57)
Message:

Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'

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

(No files)

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