This does the same cleanup as was done in 4fc27714bd on new occurrances in the code base. This fixes building with MSVC 2015 (which is still only a release candidate).
Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 4 files). Show all
Unified · Split
| @@ -1570,7 +1570,7 @@ int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uin · 1569 unmodified lines | |||
| 1570 | if (iUsedBits > (pBs->iBits - | 1570 | if (iUsedBits > (pBs->iBits - |
| 1571 | 1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. | 1571 | 1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. |
| 1572 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 1572 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 1573 | "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.", | 1573 | "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%" PRId64 " > pBs->iBits:%d, MUST stop decoding.", |
| 1574 | (int64_t) iUsedBits, pBs->iBits); | 1574 | (int64_t) iUsedBits, pBs->iBits); |
| 1575 | return -1; | 1575 | return -1; |
| 1576 | } | 1576 | } |
| @@ -1993,7 +1993,7 @@ int32_t WelsDecodeMbCavlcPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uin · 416 unmodified lines | |||
| 1993 | if (iUsedBits > (pBs->iBits - | 1993 | if (iUsedBits > (pBs->iBits - |
| 1994 | 1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. | 1994 | 1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash. |
| 1995 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 1995 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 1996 | "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%"PRId64" > pBs->iBits:%d, MUST stop decoding.", | 1996 | "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%" PRId64 " > pBs->iBits:%d, MUST stop decoding.", |
| 1997 | (int64_t) iUsedBits, pBs->iBits); | 1997 | (int64_t) iUsedBits, pBs->iBits); |
| 1998 | return -1; | 1998 | return -1; |
| 1999 | } | 1999 | } |