Changeset 382545ae in ffmpeg

Timestamp:
Nov 1, 2013, 6:20:02 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
81c3bb78
Parents:
935d0ee0 (diff), 28240a60 (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> (11/01/13 18:19:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/01/13 18:20:02)
Message:

Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

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

(No files)

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