[FFmpeg-cvslog] lavf/nutdec: Fix an impossible condition, regression since e0c53c34.

Carl Eugen Hoyos git at videolan.org
Tue May 2 09:50:52 EEST 2017


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue May  2 08:43:12 2017 +0200| [20da4135020fdf66f6060bb14926befbcc42a7dd] | committer: Carl Eugen Hoyos

lavf/nutdec: Fix an impossible condition, regression since e0c53c34.

Fixes ticket #6362.

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

 libavformat/nutdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 4272f8816c..27440c88d4 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -202,7 +202,7 @@ static int decode_main_header(NUTContext *nut)
     end += avio_tell(bc);
 
     nut->version = ffio_read_varlen(bc);
-    if (nut->version < NUT_MIN_VERSION &&
+    if (nut->version < NUT_MIN_VERSION ||
         nut->version > NUT_MAX_VERSION) {
         av_log(s, AV_LOG_ERROR, "Version %d not supported.\n",
                nut->version);



More information about the ffmpeg-cvslog mailing list