Changeset 3775224b in ffmpeg

Timestamp:
Mar 20, 2014, 9:12:11 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
011d83d
Parents:
ba85bfab (diff), 54a6e08a (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/20/14 21:12:06)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/20/14 21:12:11)
Message:

Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

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

(No files)

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