mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-11-11 12:02:22 +03:00
* 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>