Changeset c4f3b55f in ffmpeg

Timestamp:
Oct 3, 2013, 9:16:57 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5a63fb66
Parents:
f5b27b6d (diff), 06e7301a (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/03/13 09:13:37)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/03/13 09:16:57)
Message:

Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

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

(No files)

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