Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/nutdec.c
index 8d378cabc3526ab63a2b5b391ea76488a566a2cc,8ec67ae355b54466242e2071ea62117841fefd67..8a4fe4c43d1a827caf131bb9ae3c86a32c07ff98
--- 1/libavformat/nutdec.c
--- 2/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@@ -229,15 -213,13 +229,15 @@@ static int decode_main_header(NUTContex
      end  = get_packetheader(nut, bc, 1, MAIN_STARTCODE);
      end += avio_tell(bc);
  
-     tmp = ffio_read_varlen(bc);
-     if (tmp < NUT_MIN_VERSION && tmp > NUT_MAX_VERSION) {
-         av_log(s, AV_LOG_ERROR, "Version %"PRId64" not supported.\n",
-                tmp);
+     nut->version = ffio_read_varlen(bc);
+     if (nut->version < NUT_MIN_VERSION &&
+         nut->version > NUT_MAX_VERSION) {
+         av_log(s, AV_LOG_ERROR, "Version %d not supported.\n",
+                nut->version);
          return AVERROR(ENOSYS);
      }
-     nut->version = tmp;
 +    if (nut->version > 3)
 +        nut->minor_version = ffio_read_varlen(bc);
  
      GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS);