summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJochen Strunk <strunk@lesspain.de>2015-03-24 10:39:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-24 14:06:03 +0100
commit0276b9524294e518cdc7cbfa12b7cb301ed86fb6 (patch)
tree59f407f155e25aa21af45a235834fc004d212af1 /libavformat
parent4a6096e48134b5e6db4ec1f2af9ad2278219186a (diff)
avformat/mov: check color parameter type explicitly.
Fixes ticket #4387. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Note, Vittorio Giovara had submitted a very similar fix to me privately a few hours before this, iam applying Jochens because it comes with a commit message too and i had not yet applied Vittorios, but For sake of credit, Vittorio independently solved this first
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1f57dab89a..dc31e5a6f7 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 (c->isom) {
+ if (strncmp(color_parameter_type, "nclx", 4) == 0) {
uint8_t color_range = avio_r8(pb) >> 7;
av_dlog(c->fc, " full %"PRIu8"", color_range);
if (color_range)