Changeset 3e641b4 in ffmpeg

Timestamp:
Nov 23, 2013, 1:46:48 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
f63ee2aa
Parents:
62e10c37 (diff), 7671dd7c (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/23/13 13:43:08)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/23/13 13:46:48)
Message:

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

Conflicts:

Changelog
Makefile
configure
ffmpeg.h

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

(No files)

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