Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Wed, 13 Jul 2016 14:56:20 +0000 (16:56 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Wed, 13 Jul 2016 14:56:20 +0000 (16:56 +0200)
commit354336490da0c1ee2c887bbf8f25b46610233608
treee5e7f7bb84b2b8c20d701b18a0a79efc77877d2f
parent3c058f570128dcfa3a68f0860e2be7f098e8d6e1
parent846a3e78a535f05ee61bb23a160f3378f041f751
Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'

* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
  mov: Support prores with multiple stsd

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
libavformat/mov.c