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 (2 of 8 files). Show all

Unified · Split

2 files
  1. codec/processing/src/common/WelsFrameWork.cpp +6 −6
  2. codec/processing/src/common/typedef.h +1 −1
codec/processing/src/common/WelsFrameWork.cpp+6−6
@@ -44,20 +44,20 @@ · 43 unmodified lines
4444
4545 /* interface API implement */
4646
47−EResult CreateVpInterface (void** ppCtx, int iVersion) {
47+EResult WelsCreateVpInterface (void** ppCtx, int iVersion) {
4848 if (iVersion & 0x8000)
49− return nsWelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
49+ return WelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
5050 else if (iVersion & 0x7fff)
51− return nsWelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
51+ return WelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
5252 else
5353 return RET_INVALIDPARAM;
5454 }
5555
56−EResult DestroyVpInterface (void* pCtx, int iVersion) {
56+EResult WelsDestroyVpInterface (void* pCtx, int iVersion) {
5757 if (iVersion & 0x8000)
58− return nsWelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
58+ return WelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
5959 else if (iVersion & 0x7fff)
60− return nsWelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
60+ return WelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
6161 else
6262 return RET_INVALIDPARAM;
6363 }
codec/processing/src/common/typedef.h+1−1
@@ -47,7 +47,7 @@ · 46 unmodified lines
4747 #define WELSVP_EXTERN_C_BEGIN extern "C" {
4848 #define WELSVP_EXTERN_C_END }
4949
50−#define WELSVP_NAMESPACE_BEGIN namespace nsWelsVP {
50+#define WELSVP_NAMESPACE_BEGIN namespace WelsVP {
5151 #define WELSVP_NAMESPACE_END }
5252
5353 // Get the stdint type definitions from typedefs.h in the common lib

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