[SCM] libav/experimental: nut: Use nut->version in the version range check
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:47 UTC 2014
The following commit has been merged in the experimental branch:
commit 52a1c32c0a86e84d43f977c5148e62975a0c6917
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Mon Jul 7 20:48:34 2014 +0200
nut: Use nut->version in the version range check
It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 838c181..8ec67ae 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -214,9 +214,10 @@ static int decode_main_header(NUTContext *nut)
end += avio_tell(bc);
nut->version = 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);
+ 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);
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list