Changeset 29d64b1d in ffmpeg

Timestamp:
Oct 13, 2013, 6:09:28 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
40ade071
Parents:
b35ef855 (diff), 66d3f5fd (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/13/13 06:07:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/13/13 06:09:28)
Message:

Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'

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

(No files)

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