generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename namespace and funciton name to avoid conflicts with old library

Browse Source
This commit is contained in:
ruil2
2014-09-17 15:50:59 +08:00
parent 25b723c413
commit 3ff145e839
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codec/processing/interface/IWelsVP.h
View File

@@ -300,8 +300,8 @@ class IWelsVP {
#endif
WELSVP_EXTERNC_BEGIN
EResult CreateVpInterface (void** ppCtx, int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult DestroyVpInterface (void* pCtx , int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult WelsCreateVpInterface (void** ppCtx, int iVersion /*= WELSVP_INTERFACE_VERION*/);
EResult WelsDestroyVpInterface (void* pCtx , int iVersion /*= WELSVP_INTERFACE_VERION*/);
WELSVP_EXTERNC_END
//////////////////////////////////////////////////////////////////////////////////////////////

12
codec/processing/src/common/WelsFrameWork.cpp
View File

@@ -44,20 +44,20 @@
/* interface API implement */
EResult CreateVpInterface (void** ppCtx, int iVersion) {
EResult WelsCreateVpInterface (void** ppCtx, int iVersion) {
if (iVersion & 0x8000)
return nsWelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
return WelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
else if (iVersion & 0x7fff)
return nsWelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
return WelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
else
return RET_INVALIDPARAM;
}
EResult DestroyVpInterface (void* pCtx, int iVersion) {
EResult WelsDestroyVpInterface (void* pCtx, int iVersion) {
if (iVersion & 0x8000)
return nsWelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
return WelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
else if (iVersion & 0x7fff)
return nsWelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
return WelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
else
return RET_INVALIDPARAM;
}

2
codec/processing/src/common/typedef.h
View File

@@ -47,7 +47,7 @@
#define WELSVP_EXTERN_C_BEGIN extern "C" {
#define WELSVP_EXTERN_C_END }
#define WELSVP_NAMESPACE_BEGIN namespace nsWelsVP {
#define WELSVP_NAMESPACE_BEGIN namespace WelsVP {
#define WELSVP_NAMESPACE_END }
// Get the stdint type definitions from typedefs.h in the common lib