Merge remote-tracking branch 'upstream/master'

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit 3eb2a132 parents a313955 c435fb914 files · +2356 −2337Browse files

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

Unified · Split

codec/decoder/core/src/decoder_core.cpp+1−1

@@ -404,7 +404,7 @@ void CreateImplicitWeightTable (PWelsDecoderContext pCtx) { · 403 unmodified lines
404	//fix Bugzilla 1485229 check if pointers are NULL	404	//fix Bugzilla 1485229 check if pointers are NULL
405	if (pCtx->sRefPic.pRefList[LIST_0][0] && pCtx->sRefPic.pRefList[LIST_1][0]) {	405	if (pCtx->sRefPic.pRefList[LIST_0][0] && pCtx->sRefPic.pRefList[LIST_1][0]) {
406	if (pSliceHeader->uiRefCount[0] == 1 && pSliceHeader->uiRefCount[1] == 1	406	if (pSliceHeader->uiRefCount[0] == 1 && pSliceHeader->uiRefCount[1] == 1
407	&& pCtx->sRefPic.pRefList[LIST_0][0]->iFramePoc + pCtx->sRefPic.pRefList[LIST_1][0]->iFramePoc == 2 * iPoc) {	407	&& int64_t(pCtx->sRefPic.pRefList[LIST_0][0]->iFramePoc) + int64_t(pCtx->sRefPic.pRefList[LIST_1][0]->iFramePoc) == 2 * int64_t(iPoc)) {
408	pCurDqLayer->bUseWeightedBiPredIdc = false;	408	pCurDqLayer->bUseWeightedBiPredIdc = false;
409	return;	409	return;
410	}	410	}