Merge pull request #2322 from HaiboZhu/Fix_Encoder_Info_Output

Fix the build errors when open the encoder info output
This commit is contained in:
ruil2 2016-01-08 17:15:15 +08:00
commit c32263e06b

View File

@ -4200,7 +4200,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour
(iSpatialIdx == 0) ? "#AU" : " ", (iSpatialIdx == 0) ? "#AU" : " ",
pCtx->iPOC, pCtx->iPOC,
pCtx->iFrameNum, pCtx->iFrameNum,
(uiFrameType == videoFrameTypeI || uiFrameType == videoFrameTypeIDR) ? "I" : "P", (eFrameType == videoFrameTypeI || eFrameType == videoFrameTypeIDR) ? "I" : "P",
iCurTid, iCurTid,
iCurDid, iCurDid,
0, 0,
@ -4916,7 +4916,7 @@ int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx,
"@slice=%-6d sliceType:%c idc:%d size:%-6d\n", "@slice=%-6d sliceType:%c idc:%d size:%-6d\n",
iSliceIdx, iSliceIdx,
(pCtx->eSliceType == P_SLICE ? 'P' : 'I'), (pCtx->eSliceType == P_SLICE ? 'P' : 'I'),
eNalRefIdc, keNalRefIdc,
iSliceSize); iSliceSize);
#endif//SLICE_INFO_OUTPUT #endif//SLICE_INFO_OUTPUT