Merge pull request #1121 from ruil2/interface_update_1

interface update

dongzha committed 12 years ago

Commit 0cafc562 parents 0110e5d 45c2fff9 files · +33 −46Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 9 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+1−1

@@ -3712,7 +3712,7 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 3711 unmodified lines
3712		3712
3713	// we can not use direct struct based memcpy due some fields need keep unchanged as before	3713	// we can not use direct struct based memcpy due some fields need keep unchanged as before
3714	pOldParam->fMaxFrameRate = pNewParam->fMaxFrameRate; // maximal frame rate [Hz / fps]	3714	pOldParam->fMaxFrameRate = pNewParam->fMaxFrameRate; // maximal frame rate [Hz / fps]
3715	pOldParam->iInputCsp = pNewParam->iInputCsp; // color space of input sequence	3715	pOldParam->iComplexityMode = pNewParam->iComplexityMode; // color space of input sequence
3716	pOldParam->uiIntraPeriod = pNewParam->uiIntraPeriod; // intra period (multiple of GOP size as desired)	3716	pOldParam->uiIntraPeriod = pNewParam->uiIntraPeriod; // intra period (multiple of GOP size as desired)
3717	pOldParam->bEnableSpsPpsIdAddition = pNewParam->bEnableSpsPpsIdAddition;	3717	pOldParam->bEnableSpsPpsIdAddition = pNewParam->bEnableSpsPpsIdAddition;
3718	pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl;	3718	pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl;