Browse code
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.
Nicolas George authored on 2013/04/22 00:19:03Showing 2 changed files
| ... | ... |
@@ -297,7 +297,7 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x) |
| 297 | 297 |
val= GET_BYTE;\ |
| 298 | 298 |
{\
|
| 299 | 299 |
uint32_t top = (val & 128) >> 1;\ |
| 300 |
- if ((val & 0xc0) == 0x80)\ |
|
| 300 |
+ if ((val & 0xc0) == 0x80 || val >= 0xFE)\ |
|
| 301 | 301 |
ERROR\ |
| 302 | 302 |
while (val & top) {\
|
| 303 | 303 |
int tmp= GET_BYTE - 128;\ |
| ... | ... |
@@ -76,7 +76,7 @@ |
| 76 | 76 |
|
| 77 | 77 |
#define LIBAVUTIL_VERSION_MAJOR 52 |
| 78 | 78 |
#define LIBAVUTIL_VERSION_MINOR 27 |
| 79 |
-#define LIBAVUTIL_VERSION_MICRO 100 |
|
| 79 |
+#define LIBAVUTIL_VERSION_MICRO 101 |
|
| 80 | 80 |
|
| 81 | 81 |
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| 82 | 82 |
LIBAVUTIL_VERSION_MINOR, \ |