Changeset 0a30ad34 in ffmpeg

Timestamp:
Feb 19, 2014, 8:53:58 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ca5b45b9
Parents:
4332b01c (diff), 874c751c (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/19/14 20:53:42)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/19/14 20:53:58)
Message:

Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0'

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

(No files)

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