git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ac5a29
)
mov: Correctly check the color transfer characteristics range
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Mon, 13 Oct 2014 12:34:24 +0000
(13:34 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Wed, 15 Oct 2014 13:48:40 +0000
(14:48 +0100)
Reported-by: Ruoyu <liangry@ucweb.com>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
2b64cbf
..
0e29bf3
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-923,7
+923,8
@@
static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
* 23001-8) so some adjusting is required */
if (color_primaries >= AVCOL_PRI_FILM)
color_primaries = AVCOL_PRI_UNSPECIFIED;
- if (color_trc >= AVCOL_TRC_LINEAR || color_trc <= AVCOL_TRC_LOG_SQRT ||
+ if ((color_trc >= AVCOL_TRC_LINEAR &&
+ color_trc <= AVCOL_TRC_LOG_SQRT) ||
color_trc >= AVCOL_TRC_BT2020_10)
color_trc = AVCOL_TRC_UNSPECIFIED;
if (color_matrix >= AVCOL_SPC_BT2020_NCL)