Changeset 96398cc1 in ffmpeg

Timestamp:
Nov 24, 2014, 12:48:31 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
7a19a8fb
Parents:
f41d409b (diff), 208f3abb (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/24/14 12:46:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/24/14 12:48:31)
Message:

Merge commit '208f3abb917757743313da0da714e525e03159d2'

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

(No files)

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