Merge pull request #1357 from mstorsjo/silence-warnings

Fix build warnings with gcc in EncodeDecodeTest
This commit is contained in:
Ethan Hugg 2014-09-16 08:35:39 -07:00
commit 5c67f368c3

View File

@ -270,7 +270,7 @@ long IsKeyFrameLost (ISVCDecoder* pDecoder, SLTRRecoverRequest* p_LTR_Recover_Re
if (m_P2PmodeFlag && temple_id == 0) { if (m_P2PmodeFlag && temple_id == 0) {
pDecoder->GetOption (DECODER_OPTION_IDR_PIC_ID, &tempInt); pDecoder->GetOption (DECODER_OPTION_IDR_PIC_ID, &tempInt);
// idr_pic_id change ,reset last correct position // idr_pic_id change ,reset last correct position
if (p_LTR_Recover_Request->uiIDRPicId != tempInt) { if (p_LTR_Recover_Request->uiIDRPicId != (unsigned int) tempInt) {
p_LTR_Recover_Request->uiIDRPicId = tempInt; p_LTR_Recover_Request->uiIDRPicId = tempInt;
p_LTR_Recover_Request->iLastCorrectFrameNum = -1; p_LTR_Recover_Request->iLastCorrectFrameNum = -1;
} }
@ -731,6 +731,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_SLICE_COPY) {
LTRMarkFeedback (decoder_, encoder_, &m_LTR_Marking_Feedback, rv); LTRMarkFeedback (decoder_, encoder_, &m_LTR_Marking_Feedback, rv);
iIdx++; iIdx++;
} }
(void) iSkipedBytes;
} }
INSTANTIATE_TEST_CASE_P (EncodeDecodeTestBase, EncodeDecodeTestAPI, INSTANTIATE_TEST_CASE_P (EncodeDecodeTestBase, EncodeDecodeTestAPI,