Changeset 13405ecd in ffmpeg

Timestamp:
Mar 20, 2014, 8:29:37 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
adf82fe4
Parents:
047cf46e (diff), 30f3f959 (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> (03/20/14 20:29:31)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/20/14 20:29:37)
Message:

Merge commit '30f3f959879eee7890973e8cc9ce076450ced111'

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

(No files)

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