Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 10:36:43 +0000 (11:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 10:44:26 +0000 (11:44 +0100)
commit18a964799636a19cceca225ad0264d1408cc3d24
tree31deefd74819e5968f97b10b3648901391ce0c3c
parent83ee820a1678937ab8343f2766e9662ef9fd420f
parent66a0ac0a802dd794acc1ab8559d3db9e98755b57
Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'

* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
  mkv: Add support for DVB subtitles

See: 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68
Merged-by: Michael Niedermayer <michaelni@gmx.at>