diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:08:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 21:18:36 +0200 |
| commit | a26ecba07514317d500d1af64bdfc5b53148c408 (patch) | |
| tree | 55e449a10cba6eb6f491380944567945b3743201 | |
| parent | eee6ad38f99ad38b7d60382f572cbd5542a80c4c (diff) | |
| parent | 52a1c32c0a86e84d43f977c5148e62975a0c6917 (diff) | |
| download | ffmpeg-a26ecba07514317d500d1af64bdfc5b53148c408.tar.gz | |
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>
| -rw-r--r-- | libavformat/nutdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8d378cabc3..8a4fe4c43d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -229,13 +229,13 @@ static int decode_main_header(NUTContext *nut) 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); |