Changeset 0fbeeb93 in ffmpeg

Timestamp:
Nov 1, 2013, 4:57:57 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
6262763d
Parents:
3a0c9026 (diff), 959bea1 (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.
Message:

Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

Conflicts:

Changelog
libavformat/matroskadec.c
libavformat/version.h

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

(No files)

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