Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:09:20 +0000 (00:09 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:10:42 +0000 (00:10 -0300)
commitd99c3af7072d0011c4f2cbedb2f624e6b616cfc0
tree7ae25b82a8c95c0937243732399ebc8e658071ba
parent2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90
parentb446f0e98f85e2e931b476e52b319f1c49244660
Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'

* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
  mov: Do not try to parse multiple stsd for the same track

See 8b43ee4054af799e388d380b379a13a60849c1b5

Merged-by: James Almer <jamrial@gmail.com>
libavformat/mov.c