History

Fix warning and turn on -Werror for Travis

Ethan Hugg committed 12 years ago

Commit 50a74381 parent 69cdf614 files · +14 −7Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+4−4
@@ -2123,9 +2123,9 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2122 unmodified lines
21232123 }
21242124
21252125 #if defined(MEMORY_MONITOR)
2126− WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %u bytes\n",
2127− (unsigned int) (sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
2128− + pCtx->pMemAlign->WelsGetMemoryUsage()) /* requested size from CMemoryAlign::WelsMalloc() */
2126+ WelsLog (pCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %zu bytes\n",
2127+ sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
2128+ + pCtx->pMemAlign->WelsGetMemoryUsage() /* requested size from CMemoryAlign::WelsMalloc() */
21292129 );
21302130 #endif//MEMORY_MONITOR
21312131
@@ -2944,7 +2944,7 @@ int32_t WritePadding (sWelsEncCtx* pCtx, int32_t iLen) { · 812 unmodified lines
29442944 #if GOM_TRACE_FLAG
29452945 WelsLog (pCtx, WELS_LOG_ERROR,
29462946 "[RC] paddingcal pBuffer overflow, bufferlen=%d, paddinglen=%d, iNalIdx= %d, iCountNals= %d\n",
2947− (pBs->pBufEnd - pBs->pBufPtr), iLen, iNal, pCtx->pOut->iCountNals);
2947+ static_cast<int>(pBs->pBufEnd - pBs->pBufPtr), iLen, iNal, pCtx->pOut->iCountNals);
29482948 #endif
29492949 return 0;
29502950 }

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