Changeset 2b88cb2 in ffmpeg

Timestamp:
Feb 5, 2014, 1:25:34 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6a4cc509
Parents:
cd04f0da (diff), 2240e207 (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/05/14 01:16:20)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/05/14 01:25:34)
Message:

Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'

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

(No files)

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