Changeset 7cbe1e04 in ffmpeg

Timestamp:
Nov 17, 2014, 10:06:13 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f1b20930
Parents:
9421d97 (diff), 920bca3 (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/17/14 10:05:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/17/14 10:06:13)
Message:

Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'

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

(No files)

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