From a291470072896d43ab154af4e90bd3c5052b3177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 30 Oct 2014 11:06:46 +0200 Subject: [PATCH] Avoid warnings about converting from int to bool MSVC used to warn about this. --- codec/encoder/core/src/encoder_ext.cpp | 2 +- codec/encoder/core/src/svc_encode_slice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp index 3f6f58df..a54f15ec 100644 --- a/codec/encoder/core/src/encoder_ext.cpp +++ b/codec/encoder/core/src/encoder_ext.cpp @@ -948,7 +948,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { } // initialize pPps - WelsInitPps (pPps, pSps, pSubsetSps, iPpsId, true, bUseSubsetSps,pParam->iEntropyCodingModeFlag); + WelsInitPps (pPps, pSps, pSubsetSps, iPpsId, true, bUseSubsetSps,pParam->iEntropyCodingModeFlag != 0); // Not using FMO in SVC coding so far, come back if need FMO { diff --git a/codec/encoder/core/src/svc_encode_slice.cpp b/codec/encoder/core/src/svc_encode_slice.cpp index 7de617cc..dc28a3d5 100644 --- a/codec/encoder/core/src/svc_encode_slice.cpp +++ b/codec/encoder/core/src/svc_encode_slice.cpp @@ -748,7 +748,7 @@ int32_t WelsCodeOneSlice (sWelsEncCtx* pEncCtx, const int32_t kiSliceIdx, const if (ENC_RETURN_SUCCESS != iEncReturn) return iEncReturn; - WelsWriteSliceEndSyn (pCurSlice, pEncCtx->pSvcParam->iEntropyCodingModeFlag); + WelsWriteSliceEndSyn (pCurSlice, pEncCtx->pSvcParam->iEntropyCodingModeFlag != 0); return ENC_RETURN_SUCCESS; }