diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:17:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:19:27 +0200 |
| commit | 98c7d305a7b25990db92738e21076d6b2479859e (patch) | |
| tree | 9737df61b533332eb3b45e50f1e81985579fcb03 /libavcodec | |
| parent | 9fd3d9acf7fbf46bf1d7af518a4690d8f7cf3886 (diff) | |
| parent | be089af38f65dc8b1fe3564f98020fc815577edb (diff) | |
| download | ffmpeg-98c7d305a7b25990db92738e21076d6b2479859e.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions