Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:18:03 +0000 (22:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 21:18:03 +0000 (22:18 +0100)
commitf769671f86ed84a886a4360998ddd7f1fb0bc55d
tree2e2fa57038ed478722e3c56daa5535d8ce996274
parenta38a1d516fe68542523c772af27e41f28ae9852c
parent090c67d586e3916f9acc49e010b6389d07f97153
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'

* commit '090c67d586e3916f9acc49e010b6389d07f97153':
  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