Changeset 95482092 in ffmpeg

Timestamp:
Dec 6, 2014, 12:23:09 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e827f656
Parents:
8616c5b7 (diff), 8c0a865a (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> (12/06/14 00:01:06)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/06/14 00:23:09)
Message:

Merge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'

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

(No files)

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