Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 18:44:05 +0000 (20:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 18:55:42 +0000 (20:55 +0200)
commit141ee109132a2e79adf4b9067a3bef2d061967b1
tree7c8e5ebab12e20fba66a9e0979bf4169ae31d429
parentee78b0c252e54b7e26043d060b45c22654719ffb
parent48e6432407a73d5006d84609456e6e0bc3dd8fc4
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'

* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c