[FFmpeg-cvslog] lavu: fix GET_UTF8 macro.

Nicolas George git at videolan.org
Thu Apr 25 00:04:01 CEST 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Apr 21 17:19:03 2013 +0200| [29ebb7ba8d7e25b8a522393f1866a27e50869ba9] | committer: Nicolas George

lavu: fix GET_UTF8 macro.

Prevent 0xFE and 0xFF from being considered the start of
non-standard 7-bytes sequences. No noticeable effect on speed.

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

 libavutil/common.h  |    2 +-
 libavutil/version.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index e303c25..13f2ffb 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 e46e97c..abcdba8 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, \



More information about the ffmpeg-cvslog mailing list