[FFmpeg-cvslog] mov: Correctly check the color transfer characteristics range

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Oct 13 13:34:24 2014 +0100| [74b02377980321934e33969c84733ace7e9f4eeb] | committer: Vittorio Giovara

mov: Correctly check the color transfer characteristics range

Reported-by: Ruoyu <liangry at ucweb.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74b02377980321934e33969c84733ace7e9f4eeb
---

 libavformat/mov.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2b64cbf..0e29bf3 100644
--- 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)