diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 21:39:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 21:40:13 +0200 |
| commit | 16f9f7b881d2025e47c73fc30dbe5cc47109a711 (patch) | |
| tree | 3802d8862819a5e4fa693e3dd43c82911f9ebb3c | |
| parent | cacc1dcadc788648779ea58201a8af25c2290676 (diff) | |
| parent | 74b02377980321934e33969c84733ace7e9f4eeb (diff) | |
| download | ffmpeg-16f9f7b881d2025e47c73fc30dbe5cc47109a711.tar.gz | |
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'
* commit '74b02377980321934e33969c84733ace7e9f4eeb':
mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 69a61fb993..13ba907cfb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -967,7 +967,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) |