Commit 16f9f7b8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '74b02377'

* commit '74b02377':
  mov: Correctly check the color transfer characteristics range
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents cacc1dca 74b02377
...@@ -967,7 +967,8 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -967,7 +967,8 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
* 23001-8) so some adjusting is required */ * 23001-8) so some adjusting is required */
if (color_primaries >= AVCOL_PRI_FILM) if (color_primaries >= AVCOL_PRI_FILM)
color_primaries = AVCOL_PRI_UNSPECIFIED; 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_BT2020_10)
color_trc = AVCOL_TRC_UNSPECIFIED; color_trc = AVCOL_TRC_UNSPECIFIED;
if (color_matrix >= AVCOL_SPC_BT2020_NCL) if (color_matrix >= AVCOL_SPC_BT2020_NCL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment