Changeset a63ec9d5 in ffmpeg

Timestamp:
Nov 25, 2014, 10:18:58 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
bcccb2c2
Parents:
0aa20883 (diff), c117da9d (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> (11/25/14 10:17:50)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/25/14 10:18:58)
Message:

Merge commit 'c117da9d3e0db7dc311d817054988364b3ef4587'

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

(No files)

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