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 | |
| 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>
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index c63e817276..64e2824cda 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1001,7 +1001,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_dlog(c->fc, "%s: pri %d trc %d matrix %d", color_parameter_type, color_primaries, color_trc, color_matrix); - if (strncmp(color_parameter_type, "nclx", 4) == 0) { + if (!strncmp(color_parameter_type, "nclx", 4)) { uint8_t color_range = avio_r8(pb) >> 7; av_dlog(c->fc, " full %"PRIu8"", color_range); if (color_range) @@ -1021,7 +1021,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) st->codec->color_primaries = color_primaries; st->codec->color_trc = color_trc; st->codec->colorspace = color_matrix; - } else { + } else if (!strncmp(color_parameter_type, "nclc", 4)) { /* color primaries, Table 4-4 */ switch (color_primaries) { case 1: st->codec->color_primaries = AVCOL_PRI_BT709; break; |