summaryrefslogtreecommitdiff
path: root/src/av_format_identify.c
diff options
context:
space:
mode:
authorXiaoqing MA <[email protected]>2018-07-16 15:52:19 +0800
committerXiaoqing MA <[email protected]>2018-07-16 15:52:19 +0800
commitcc9d9d1739240ca0c1205c7a4ae6a9c9644e933f (patch)
treedbdeeabf69291458f09990d4c1aab30977e590d8 /src/av_format_identify.c
parent1661fda66e80fd6b7b453156c2974426b43e791d (diff)
按照编译提示warnings修改部分逻辑关系符优先级,memset问题等
Diffstat (limited to 'src/av_format_identify.c')
-rw-r--r--src/av_format_identify.c11
1 files changed, 5 insertions, 6 deletions
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;
}