Skip to content

Commit 60384c7

Browse files
author
AMD\tnarine
committed
Squashed 'amf/public/' changes from fd860e8..6946d9a
6946d9a Update shared code for upcoming AMF SDK release 1e3d6c9 Manually porting over Merge pull request #55 from Xaymar/master git-subtree-dir: amf/public git-subtree-split: 6946d9a49ed815a547cf9226f0e9309604b49035
1 parent f24a550 commit 60384c7

32 files changed

+2576
-467
lines changed

common/AMFFactory.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535

3636
AMFFactoryHelper g_AMFFactory;
3737

38+
#ifdef AMF_CORE_STATIC
3839
extern "C"
3940
{
4041
extern AMF_CORE_LINK AMF_RESULT AMF_CDECL_CALL AMFInit(amf_uint64 version, amf::AMFFactory **ppFactory);
4142
}
42-
43+
#endif
4344

4445
//-------------------------------------------------------------------------------------------------
4546
AMFFactoryHelper::AMFFactoryHelper() :

0 commit comments

Comments
 (0)