Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:05:10 +0000 (01:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:09:00 +0000 (01:09 +0100)
commit53dd75e91154100a83b11f6ef9dfd15d79bcc3aa
tree28d727a541c482d942304d80162b537fcab2580a
parent3130e5be92858b9a15622965cacc9fe59f5336c2
parentda7e561964ee833678dc24fae0b0265358126d1e
Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'

* commit 'da7e561964ee833678dc24fae0b0265358126d1e':
  matroskaenc: Allow writing track "forced" flag

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