Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 13:04:48 +0000 (14:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 13:05:09 +0000 (14:05 +0100)
commit3fac99cd9d002423a746522736f93742c84df018
tree507fd36cdd9c73d5f28c55773a293bb63f09d881
parentd98aa7cdc19b6392ab3a29b11305104338166ddc
parent981cf0c300037950be2ed20505ff8b20e7a53224
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

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