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)
* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
  mov: Add a comment referring to the standard that defines the loci box

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

Simple merge