History

Add casts when converting pointer differences to integers

This fixes warnings when building with MSVC in 64 bit mode.

Martin Storsjö committed 11 years ago

Commit 917d41b1 parent 82b70b31 file · +3 −3Browse files

Showing the changes to codec/decoder/core/src/au_parser.cpp (1 of 1 file). Show all

Unified · Split

codec/decoder/core/src/au_parser.cpp+3−3
@@ -1053,7 +1053,7 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 1052 unmodified lines
1053 pCtx->iErrorCode |= dsOutOfMemory;1053 pCtx->iErrorCode |= dsOutOfMemory;
1054 return pCtx->iErrorCode;1054 return pCtx->iErrorCode;
1055 }1055 }
1056 DecInitBitsForEncoding (&sSubsetSpsBs, pBsBuf, pBs->pEndBuf - pBs->pStartBuf);1056 DecInitBitsForEncoding (&sSubsetSpsBs, pBsBuf, (int32_t) (pBs->pEndBuf - pBs->pStartBuf));
1057 DecBsWriteBits (&sSubsetSpsBs, 8, 77); //profile_idc, forced to Main profile1057 DecBsWriteBits (&sSubsetSpsBs, 8, 77); //profile_idc, forced to Main profile
1058 DecBsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet0Flag); // constraint_set0_flag1058 DecBsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet0Flag); // constraint_set0_flag
1059 DecBsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet1Flag); // constraint_set1_flag1059 DecBsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet1Flag); // constraint_set1_flag
@@ -1093,9 +1093,9 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 33 unmodified lines
1093 }1093 }
1094 DecBsWriteOneBit (&sSubsetSpsBs, 0); //vui_parameters_present_flag1094 DecBsWriteOneBit (&sSubsetSpsBs, 0); //vui_parameters_present_flag
1095 DecBsRbspTrailingBits (&sSubsetSpsBs); //finished, rbsp trailing bit1095 DecBsRbspTrailingBits (&sSubsetSpsBs); //finished, rbsp trailing bit
1096 int32_t iRbspSize = sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf;1096 int32_t iRbspSize = (int32_t) (sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf);
1097 RBSP2EBSP (pSpsBs->pSpsBsBuf + 5, sSubsetSpsBs.pStartBuf, iRbspSize);1097 RBSP2EBSP (pSpsBs->pSpsBsBuf + 5, sSubsetSpsBs.pStartBuf, iRbspSize);
1098 pSpsBs->uiSpsBsLen = sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf + 5;1098 pSpsBs->uiSpsBsLen = (uint16_t) (sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf + 5);
1099 if (pBsBuf) {1099 if (pBsBuf) {
1100 WelsFree (pBsBuf, "pBsBuf for parse only usage");1100 WelsFree (pBsBuf, "pBsBuf for parse only usage");
1101 }1101 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t