Changeset 123c6ca8 in ffmpeg

Timestamp:
Oct 17, 2013, 5:51:12 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
57c018d5
Parents:
904c89ac (diff), f52fd3f3 (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> (10/17/13 17:50:19)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (10/17/13 17:51:12)
Message:

Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

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

(No files)

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