[FFmpeg-cvslog] Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:33:20 2015 +0100| [6f9bb83dbb93bc3bb25d23a342fb85c2eb99298e] | committer: Michael Niedermayer

Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4

* commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515':
  matroskaenc: write correct Display{Width, Height} in stereo encoding

Conflicts:
	libavformat/matroskaenc.c

See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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