shithub: openh264

Download patch

ref: 1a78f69f2f3d85798ce50cc75478b8c85ce95f5a
parent: d1a3bd3d333207d7d47163f8adc205907c81fb26
parent: 869c567f0415f3302e2f35b4a32dcf4fa314dc19
author: HaiboZhu <[email protected]>
date: Fri Oct 17 06:09:39 EDT 2014 

Merge pull request #1418 from huili2/EC_option_bugfix

ec disable bug fix


--- a/codec/decoder/core/src/decoder_core.cpp
+++ b/codec/decoder/core/src/decoder_core.cpp
@@ -1982,7 +1982,7 @@
     if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) {
       if (!pCtx->bInstantDecFlag) {
         //Do error concealment here
-        if (NeedErrorCon (pCtx)) {
+        if ((NeedErrorCon (pCtx)) && (pCtx->eErrorConMethod != ERROR_CON_DISABLE)) {
           ImplementErrorCon (pCtx);
           pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
           pCtx->pDec->iSpsId = pCtx->pSps->iSpsId;
@@ -2039,7 +2039,8 @@
           MarkECFrameAsRef (pCtx);
         }
       } else {
-        DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
+        if (DecodeFrameConstruction (pCtx, ppDst, pDstInfo))
+          return false;
       }
       pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num
       if (pCtx->bLastHasMmco5)