Changeset 8c6651a1 in ffmpeg

Timestamp:
Feb 24, 2015, 9:19:33 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a51b192f
Parents:
a4f50ec9 (diff), 353b492d (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/24/15 21:19:28)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/24/15 21:19:33)
Message:

Merge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'

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

(No files)

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