Changeset 8f00d7f4 in ffmpeg

Timestamp:
Feb 15, 2015, 7:57:49 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
2d2c744f
Parents:
3773b6ed (diff), a9a0b8d6 (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/15/15 19:57:45)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/15/15 19:57:49)
Message:

Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'

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

(No files)

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