From cc9d9d1739240ca0c1205c7a4ae6a9c9644e933f Mon Sep 17 00:00:00 2001 From: Xiaoqing MA Date: Mon, 16 Jul 2018 15:52:19 +0800 Subject: 按照编译提示warnings修改部分逻辑关系符优先级，memset问题等 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/av_format_identify.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/av_format_identify.c b/src/av_format_identify.c index 72ac53c..6222713 100644 --- a/src/av_format_identify.c +++ b/src/av_format_identify.c @@ -155,7 +155,7 @@ int is_flv_each(const char* buff, size_t size) const char *p = buff; int fit_times = 0; size_t left; - size_t right = 11 + htonl(*(size_t *)p) & 0x00ffffff; + size_t right = 11 + (htonl(*(size_t *)p) & 0x00ffffff); p += (right + 4); while (p < (buff + size)) @@ -178,7 +178,7 @@ int is_flv_each(const char* buff, size_t size) { break; } - right = 11 + htonl(*(size_t *)p) & 0x00ffffff; + right = 11 + (htonl(*(size_t *)p) & 0x00ffffff); p += (right + 4); } return ret_flv_each; @@ -237,7 +237,7 @@ int is_mp4_boxname(const char *buff) int i; for (i = 0; i < 4; i++) { - if (*(buff + i) < '0' || *(buff + i) > '9'&&*(buff + i) < 'a' || *(buff + i) > 'z') + if (*(buff + i) < '0' || (*(buff + i) > '9'&&*(buff + i) < 'a') || *(buff + i) > 'z') { return 0; } @@ -248,7 +248,6 @@ int is_mp4_boxname(const char *buff) void *memmem_mp4(const char *buff, size_t size) { void *ret_memmp4 = NULL; - char s; const char *p = buff; while (p + 3 < buff + size) { @@ -289,7 +288,7 @@ int is_mp4_each(const char* buff, size_t size) if (p + 4 < buff + size) { ret_mp4_boxname = is_mp4_boxname(p); - if (!is_mp4_boxname) + if (!ret_mp4_boxname) { p -= size_h; if (p + 16 < buff + size) @@ -300,7 +299,7 @@ int is_mp4_each(const char* buff, size_t size) if (p + 4 < buff + size) { ret_mp4_boxname = is_mp4_boxname(p); - if (!is_mp4_boxname) + if (!ret_mp4_boxname) { p -= size_h; } -- cgit v1.2.3