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