Michael Niedermayer
fcc3909908
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>
2014-08-28 23:48:23 +02:00
..
2014-08-24 14:35:11 +02:00
2014-03-16 14:32:47 +01:00
2014-08-28 23:48:23 +02:00
2014-08-15 21:26:12 +02:00
2014-08-01 15:03:22 +02:00
2014-07-28 18:34:16 +02:00
2014-08-24 20:03:22 -04:00
2014-07-18 19:38:54 +02:00
2014-08-24 03:04:23 +02:00
2014-05-15 19:16:57 +02:00
2014-03-24 04:02:51 +01:00
2014-05-05 19:00:14 +02:00
2014-05-29 21:26:48 +02:00