Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:33:20 +0000 (01:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:33:33 +0000 (01:33 +0100)
commit6f9bb83dbb93bc3bb25d23a342fb85c2eb99298e
tree901cdac22386f7144a19b7373eba7b9761918dc7
parent97a55f00d35cb28497002329a17ab2f39a554cea
parentbae05e5326703dad3bfe0ed5b31ba73ee9254515
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@gmx.at>
libavformat/matroskaenc.c