* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f': matroskadec: parse stereo mode on decoding Conflicts: Changelog libavformat/matroska.c libavformat/matroskadec.c See: 4c509fe305 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
4c509fe305