fix crash caused by empty packets and add more checks

Licai Guo committed 12 years ago

Commit 1a046941 parent 306a1da3 files · +4 −3Browse 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+1−1

@@ -690,7 +690,7 @@ int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWi · 689 unmodified lines
690	690	*/
691	691	void_t UpdateMaxPictureResolution (PWelsDecoderContext pCtx, const int32_t kiCurWidth, const int32_t kiCurHeight) {
692	692	//any dimension larger than that of current dimension, should modify the max-dimension
693		− if (kiCurWidth > pCtx->iMaxWidthInSps \|\| kiCurHeight > pCtx->iMaxHeightInSps) {
	693	+ if (kiCurWidth * kiCurHeight > pCtx->iMaxWidthInSps * pCtx->iMaxHeightInSps) {
694	694	pCtx->iMaxWidthInSps = kiCurWidth;
695	695	pCtx->iMaxHeightInSps = kiCurHeight;
696	696	}