History

Merge pull request #1682 from huili2/parseonly_initial_no_colorformat

disable color format check for parse only

huili2 committed 11 years ago

Commit 47d8a842 parents ad8ba85 b12b39a3 files · +11 −4Browse files

Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 3 files). Show all

Unified · Split

codec/decoder/core/src/decoder.cpp+5−3
@@ -516,9 +516,11 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 515 unmodified lines
516 516
517 memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));517 memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
518 pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;518 pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;
519 int32_t iRet = DecoderSetCsp (pCtx, pCtx->pParam->eOutputColorFormat);519 if (!pCtx->bParseOnly) {
520 if (iRet)520 int32_t iRet = DecoderSetCsp (pCtx, pCtx->pParam->eOutputColorFormat);
521 return iRet;521 if (iRet)
522 return iRet;
523 }
522 pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;524 pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;
523 525
524 if (pCtx->bParseOnly) //parse only, disable EC method526 if (pCtx->bParseOnly) //parse only, disable EC method

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