Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:22:05 +0000 (22:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:22:23 +0000 (22:22 +0100)
commitc68e53f27281abe7d72147edd1326abf7449cdff
treecabb58f365838f07074aa48a8290b706232aacc1
parent76367f453f6f7cb340c4798a2b059b81abc60c71
parentdb32f14c3dfd75290b57a086183d6577457beac4
Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'

* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
  isom: add "MNG" FourCC

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