History

Rename public interface methods to avoid two overloaded methods with the same name

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.

Martin Storsjö committed 12 years ago

Commit dd0db821 parent efaa1538 files · +17 −17Browse files

Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 8 files). Show all

Unified · Split

codec/decoder/plus/src/welsDecoderExt.cpp+2−2
@@ -340,7 +340,7 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void_t* pOption) { · 339 unmodified lines
340340 return cmInitParaError;
341341 }
342342
343−DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc,
343+DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc,
344344 const int kiSrcLen,
345345 void_t** ppDst,
346346 SBufferInfo* pDstInfo) {
@@ -430,7 +430,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc, · 83 unmodified lines
430430 DstInfo.UsrData.sSystemBuffer.iHeight = iHeight;
431431 DstInfo.eBufferProperty = BUFFER_HOST;
432432
433− eDecState = DecodeFrame (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo);
433+ eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo);
434434 if (eDecState == dsErrorFree) {
435435 pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0];
436436 pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1];

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t