Changeset bc47d126 in ffmpeg

Timestamp:
Aug 1, 2013, 8:41:06 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
161054f3
Parents:
11ace706 (diff), a9b04b2c (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> (08/01/13 08:41:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (08/01/13 08:41:06)
Message:

Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986'

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

(No files)

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