Changeset 493f750e in ffmpeg

Timestamp:
Feb 2, 2014, 4:32:12 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d9bb7fc3
Parents:
23e48cd0 (diff), 09e2203b (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/02/14 04:32:01)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/02/14 04:32:12)
Message:

Merge commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e'

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

(No files)

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