diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:40:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:48:23 +0200 |
| commit | fcc39099087e156196e3444ef479b2c778566405 (patch) | |
| tree | c01fed41ae719924e46f97ada39f186429f63c09 /libavformat/matroskaenc.c | |
| parent | 31f9c228c042e7f0a017670e7eb18d9b27a71a10 (diff) | |
| parent | d4ae8ac92f619507aadd021bb67b517d39d3a36f (diff) | |
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
0 files changed, 0 insertions, 0 deletions