Skip to content
Snippets Groups Projects
Commit 8441b71b authored by Kiyofumi Abe's avatar Kiyofumi Abe
Browse files

Update Fix gcc9.2.0 compiling error

parent 7593cd58
No related branches found
No related tags found
No related merge requests found
...@@ -2015,11 +2015,21 @@ bool ScalingList::isNotDefaultScalingList() ...@@ -2015,11 +2015,21 @@ bool ScalingList::isNotDefaultScalingList()
{ {
continue; continue;
} }
if ( ::memcmp(getScalingListAddress(sizeId, listId), getScalingListDefaultAddress(sizeId, listId), sizeof(int)*std::min(MAX_MATRIX_COEF_NUM, (int)g_scalingListSize[sizeId])) // check value of matrix if (sizeId < SCALING_LIST_16x16)
&& !( (sizeId < SCALING_LIST_16x16) || (getScalingListDC(sizeId,listId) == 16) ) ) // check DC value
{ {
isAllDefault = false; if (::memcmp(getScalingListAddress(sizeId, listId), getScalingListDefaultAddress(sizeId, listId), sizeof(int) * (int)g_scalingListSize[sizeId]))
break; {
isAllDefault = false;
break;
}
}
else
{
if ((::memcmp(getScalingListAddress(sizeId, listId), getScalingListDefaultAddress(sizeId, listId), sizeof(int) * MAX_MATRIX_COEF_NUM)) || (getScalingListDC(sizeId, listId) != 16))
{
isAllDefault = false;
break;
}
} }
} }
if (!isAllDefault) break; if (!isAllDefault) break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment