Changeset d648ffe4 in ffmpeg

Timestamp:
Mar 20, 2014, 8:44:39 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
eb680f2a
Parents:
adf82fe4 (diff), 8bd6f882 (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 20:44:05)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/20/14 20:44:39)
Message:

Merge commit '8bd6f88266740068415f7da0628117f1b802efb9'

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

(No files)

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