Changeset 80d44190 in ffmpeg

Timestamp:
Jan 6, 2014, 1:23:01 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e86cd37a
Parents:
d1134aba (diff), adb199d1 (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> (01/06/14 12:57:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (01/06/14 13:23:01)
Message:

Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

Conflicts:

libavcodec/kgv1dec.c

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

(No files)

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