Changeset 7d239316 in ffmpeg

Timestamp:
Mar 21, 2015, 2:59:20 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
04d23cf1
Parents:
ad6cee11 (diff), e6c90ce9 (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/21/15 14:59:16)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/21/15 14:59:20)
Message:

Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'

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

(No files)

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