Changeset 996fdca8 in ffmpeg

Timestamp:
Feb 10, 2014, 7:46:03 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
dfc99ca
Parents:
0a4311de (diff), a46dc497 (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/10/14 19:45:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/10/14 19:46:03)
Message:

Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'

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

(No files)

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