summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavutil/common.h2
-rw-r--r--libavutil/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index e303c258e1..13f2ffbd11 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -297,7 +297,7 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
val= GET_BYTE;\
{\
uint32_t top = (val & 128) >> 1;\
- if ((val & 0xc0) == 0x80)\
+ if ((val & 0xc0) == 0x80 || val >= 0xFE)\
ERROR\
while (val & top) {\
int tmp= GET_BYTE - 128;\
diff --git a/libavutil/version.h b/libavutil/version.h
index e46e97c4a0..abcdba8331 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -76,7 +76,7 @@
#define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 27
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \