Changeset c16e0061 in ffmpeg

Timestamp:
Apr 3, 2014, 6:44:14 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
002feaf
Parents:
061e340c (diff), 7763118c (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> (04/03/14 18:40:33)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/03/14 18:44:14)
Message:

Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'

Conflicts:

doc/APIchanges
libavutil/log.c
libavutil/version.h

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

(No files)

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