Changeset 499da71 in ffmpeg

Timestamp:
Feb 24, 2015, 10:38:19 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d2a5c6f
Parents:
1c5d9dd2 (diff), ac0e54fd (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/24/15 22:38:14)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 22:38:19)
Message:

Merge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'

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

(No files)

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