Changeset 8bf90562 in ffmpeg

Timestamp:
May 1, 2014, 2:29:40 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9173602
Parents:
feaa31d3 (diff), eb3b5501 (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> (05/01/14 02:27:17)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/01/14 02:29:40)
Message:

Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

Conflicts:

libavformat/matroska.h
libavformat/matroskadec.c

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

(No files)

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