[FFmpeg-cvslog] Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 20:17:36 2015 +0200| [98c7d305a7b25990db92738e21076d6b2479859e] | committer: Michael Niedermayer

Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'

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

Conflicts:
	libavformat/mov.c

See: 0276b9524294e518cdc7cbfa12b7cb301ed86fb6
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98c7d305a7b25990db92738e21076d6b2479859e
---