This is required to make the order in the C++ virtual table consistent in MSVC - previously the overloaded methods were ordered differently in the vtable compared to the interface declaration.
Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 8 files). Show all
Unified · Split
| @@ -340,7 +340,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void_t* pOption) { · 339 unmodified lines | |||
| 340 | return cmInitParaError; | 340 | return cmInitParaError; |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc, | 343 | DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, |
| 344 | const int kiSrcLen, | 344 | const int kiSrcLen, |
| 345 | void_t** ppDst, | 345 | void_t** ppDst, |
| 346 | SBufferInfo* pDstInfo) { | 346 | SBufferInfo* pDstInfo) { |
| @@ -430,7 +430,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc, · 83 unmodified lines | |||
| 430 | DstInfo.UsrData.sSystemBuffer.iHeight = iHeight; | 430 | DstInfo.UsrData.sSystemBuffer.iHeight = iHeight; |
| 431 | DstInfo.eBufferProperty = BUFFER_HOST; | 431 | DstInfo.eBufferProperty = BUFFER_HOST; |
| 432 | 432 | ||
| 433 | eDecState = DecodeFrame (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo); | 433 | eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo); |
| 434 | if (eDecState == dsErrorFree) { | 434 | if (eDecState == dsErrorFree) { |
| 435 | pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0]; | 435 | pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0]; |
| 436 | pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1]; | 436 | pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1]; |