Changeset e52d97a7 in ffmpeg

Timestamp:
Mar 13, 2014, 10:40:55 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d61e1156
Parents:
5dce8e56 (diff), fd9e2221 (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> (03/13/14 22:40:51)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/13/14 22:40:55)
Message:

Merge commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7'

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

(No files)

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