Browse Source

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.
tags/n2.0
Nicolas George 13 years ago
parent
commit
29ebb7ba8d
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavutil/common.h
  2. +1
    -1
      libavutil/version.h

+ 1
- 1
libavutil/common.h View File

@@ -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;\


+ 1
- 1
libavutil/version.h View File

@@ -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, \


Loading…
Cancel
Save