Changeset e166b82d in ffmpeg

Timestamp:
Oct 29, 2013, 7:07:27 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
4eb49fdd
Parents:
42bf156e (diff), 25c7db7c (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> (10/29/13 19:06:27)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/29/13 19:07:27)
Message:

Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

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

(No files)

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