History

Merge pull request #334 from mstorsjo/cleanup-vp-interface

Don't use a custom calling convention for the VP library entry points

volvet committed 12 years ago

Commit 75f8b412 parents e7ed80c 21e9c833 files · +6 −17Browse files

Showing the changes to codec/encoder/core/src/wels_preprocess.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/core/src/wels_preprocess.cpp+2−7
@@ -45,19 +45,14 @@ · 44 unmodified lines
45#include "encoder_context.h"45#include "encoder_context.h"
46#include "utils.h"46#include "utils.h"
47 47
48#ifdef NO_DYNAMIC_VP
49EResult WELSAPI CreateVpInterface (void** ppCtx, int iVersion);
50EResult WELSAPI DestroyVpInterface (void** ppCtx, int iVersion);
51#endif
52
53namespace WelsSVCEnc {48namespace WelsSVCEnc {
54 49
55#define WelsSafeDelete(p) if(p){ delete (p); (p) = NULL; }50#define WelsSafeDelete(p) if(p){ delete (p); (p) = NULL; }
56 51
57 52
58//***** entry API declaration ************************************************************************//53//***** entry API declaration ************************************************************************//
59typedef EResult (WELSAPI* pfnCreateVpInterface) (void**, int);54typedef EResult (* pfnCreateVpInterface) (void**, int);
60typedef EResult (WELSAPI* pfnDestroyVpInterface) (void*, int);55typedef EResult (* pfnDestroyVpInterface) (void*, int);
61 56
62int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);57int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
63bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);58bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);

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