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

Conflicts:
	libavformat/matroskaenc.c

See: 6103faaaMerged-by: Michael Niedermayer <michaelni@gmx.at>