Changeset b22989da in ffmpeg

Timestamp:
Dec 17, 2013, 5:08:50 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
682b28b4
Parents:
47cc6168 (diff), eddff165 (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> (12/17/13 17:08:37)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/17/13 17:08:50)
Message:

Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'

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

(No files)

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