Merge pull request #1416 from ruil2/fix

modify trace level and fix potential issues
This commit is contained in:
sijchen 2014-10-16 15:21:12 +08:00
commit d1a3bd3d33
2 changed files with 2 additions and 2 deletions

View File

@ -384,7 +384,7 @@ void PrintHelp() {
int ParseCommandLine (int argc, char** argv, SSourcePicture* pSrcPic, SEncParamExt& pSvcParam, SFilesSet& sFileSet) {
char* pCommand = NULL;
SLayerPEncCtx sLayerCtx[3];
SLayerPEncCtx sLayerCtx[MAX_SPATIAL_LAYER_NUM];
int n = 0;
string str_ ("SlicesAssign");

View File

@ -356,7 +356,7 @@ int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPa
return ENC_RETURN_UNSUPPORTED_PARA;
}
if (pSpatialLayer->sSliceCfg.sSliceArgument.uiSliceNum == 1) {
WelsLog (pLogCtx, WELS_LOG_ERROR,
WelsLog (pLogCtx, WELS_LOG_WARNING,
"ParamValidationExt(), pSlice setting for SM_RASTER_SLICE now turn to SM_SINGLE_SLICE!");
pSpatialLayer->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;
break;