Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 11:47:13 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 11:47:18 +0000 (12:47 +0100)
commit4a6096e48134b5e6db4ec1f2af9ad2278219186a
treeae621534b2dcc19716dd30c87a8367265ce58d5c
parentd66ca43fc1f62f057d43140e7a5905390739bfc7
parentb76df6efb6816901796dd76439382baa43b50ef6
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.

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