Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'

* 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>
This commit is contained in:
Michael Niedermayer
2014-08-28 23:40:31 +02:00
5 changed files with 77 additions and 2 deletions

View File

@@ -10,6 +10,7 @@ version <next>:
- LZMA compression support in TIFF decoder
- support for H.261 RTP payload format (RFC 4587)
- added codecview filter to visualize information exported by some codecs
- matroska 3d support thorugh side data
version 2.3: