Changeset c6eee312 in ffmpeg

Timestamp:
Apr 28, 2014, 11:22:22 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
21c7e996
Parents:
9c6eef6f (diff), 35177ba (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/28/14 23:06:58)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/28/14 23:22:22)
Message:

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

Conflicts:

Makefile
configure

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

(No files)

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