[FFmpeg-cvslog] avformat/mov: check color parameter type explicitly.
Jochen Strunk
git at videolan.org
Tue Mar 24 14:14:04 CET 2015
ffmpeg | branch: master | Jochen Strunk <strunk at lesspain.de> | Tue Mar 24 10:39:27 2015 +0100| [0276b9524294e518cdc7cbfa12b7cb301ed86fb6] | committer: Michael Niedermayer
avformat/mov: check color parameter type explicitly.
Fixes ticket #4387.
Signed-off-by: Michael Niedermayer <michaelni at 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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0276b9524294e518cdc7cbfa12b7cb301ed86fb6
---
libavformat/mov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1f57dab..dc31e5a 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)
More information about the ffmpeg-cvslog
mailing list