[FFmpeg-cvslog] Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 23:40:31 2014 +0200| [fcc39099087e156196e3444ef479b2c778566405] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcc39099087e156196e3444ef479b2c778566405
---