Changeset 48e661b3 in ffmpeg

Timestamp:
Feb 20, 2015, 8:40:17 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ac7128a9
Parents:
5346b57e (diff), bb8c6ac8 (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> (02/20/15 20:40:07)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/20/15 20:40:17)
Message:

Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'

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

(No files)

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