Changeset 3f41e57f in ffmpeg

Timestamp:
Nov 29, 2013, 3:21:34 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5b3c6841
Parents:
97468463 (diff), 220494ad (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/29/13 03:21:10)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/29/13 03:21:34)
Message:

Merge commit '220494ad0b2e9e980ef703b46b69308236f29be5'

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

(No files)

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