Changeset aedc1013 in ffmpeg

Timestamp:
Feb 8, 2014, 4:31:30 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1a8050ad
Parents:
df98b36a (diff), c0c45188 (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/08/14 16:31:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/08/14 16:31:30)
Message:

Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'

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

(No files)

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