* commit 'be089af3':
  mov: Rely on box type rather than file type for colr atom

Conflicts:
	libavformat/mov.c

See: 0276b952Merged-by: Michael Niedermayer <michaelni@gmx.at>