History

rename namespace and funciton name to avoid conflicts with old library

ruil2 committed 12 years ago

Commit 3ff145e1 parent 25b723c8 files · +17 −17Browse files

Showing the changes to codec/processing/src/common/WelsFrameWork.cpp (1 of 8 files). Show all

Unified · Split

codec/processing/src/common/WelsFrameWork.cpp+6−6
@@ -44,20 +44,20 @@ · 43 unmodified lines
44 44
45/* interface API implement */45/* interface API implement */
46 46
47EResult CreateVpInterface (void** ppCtx, int iVersion) {47EResult WelsCreateVpInterface (void** ppCtx, int iVersion) {
48 if (iVersion & 0x8000)48 if (iVersion & 0x8000)
49 return nsWelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);49 return WelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
50 else if (iVersion & 0x7fff)50 else if (iVersion & 0x7fff)
51 return nsWelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);51 return WelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
52 else52 else
53 return RET_INVALIDPARAM;53 return RET_INVALIDPARAM;
54}54}
55 55
56EResult DestroyVpInterface (void* pCtx, int iVersion) {56EResult WelsDestroyVpInterface (void* pCtx, int iVersion) {
57 if (iVersion & 0x8000)57 if (iVersion & 0x8000)
58 return nsWelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);58 return WelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
59 else if (iVersion & 0x7fff)59 else if (iVersion & 0x7fff)
60 return nsWelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);60 return WelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
61 else61 else
62 return RET_INVALIDPARAM;62 return RET_INVALIDPARAM;
63}63}

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