Changeset 1290143f in ffmpeg

Timestamp:
Jun 11, 2014, 12:50:50 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
b3a647d9
Parents:
26be0e31 (diff), 27860819 (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> (06/11/14 00:33:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/11/14 00:50:50)
Message:

Merge commit '27860819d508068f056cf48473af04868791ad77'

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

(No files)

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