Changeset eb580d25 in ffmpeg

Timestamp:
May 16, 2014, 8:03:10 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
627d3b8b
Parents:
36f94969 (diff), 7c377f0e (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> (05/16/14 20:02:27)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/16/14 20:03:10)
Message:

Merge commit '7c377f0e74de8ab57f6baa64f3ec197c82104764'

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

(No files)

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