Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'
authorClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:44:00 +0000 (10:44 +0200)
committerClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:44:00 +0000 (10:44 +0200)
commit6dd80591b88356ac633c9f6dc2d5d1d6a220550a
tree3a7b795fffc5ad5578ffe229f7df792958a78d5b
parent1b7eaead0cd41b75477390c3660778fb9758e9fc
parentd34826c33d401929b2ff8aee161fd39ad0a73613
Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'

* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
  mov: Add a comment referring to the standard that defines the loci box

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavformat/mov.c