From: Seungha Yang Date: Mon, 7 Feb 2022 19:51:24 +0000 (+0900) Subject: msdk: Fix for MFXUnload symbol re-definition build error X-Git-Tag: 1.22.0~2499 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8773ba1104086f84d14e81c067278219043a9b60;p=platform%2Fupstream%2Fgstreamer.git msdk: Fix for MFXUnload symbol re-definition build error Fix for libgstreamer-full build Part-of: --- diff --git a/subprojects/gst-plugins-bad/sys/msdk/msdk.c b/subprojects/gst-plugins-bad/sys/msdk/msdk.c index b46786b..fc5462f 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/msdk.c +++ b/subprojects/gst-plugins-bad/sys/msdk/msdk.c @@ -312,7 +312,7 @@ msdk_init_msdk_session (mfxIMPL impl, mfxVersion * pver, } void -MFXUnload (mfxLoader loader) +GstMFXUnload (mfxLoader loader) { g_assert (loader == NULL); } diff --git a/subprojects/gst-plugins-bad/sys/msdk/msdk.h b/subprojects/gst-plugins-bad/sys/msdk/msdk.h index 6db013d..10e44b4 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/msdk.h +++ b/subprojects/gst-plugins-bad/sys/msdk/msdk.h @@ -86,7 +86,12 @@ G_BEGIN_DECLS #if (MFX_VERSION < 2000) typedef void * mfxLoader; -void MFXUnload (mfxLoader loader); +void GstMFXUnload (mfxLoader loader); + +/* To avoid MFXUnload symbol re-define build issue in case of static build. + * MFXUnload symbol may exists if other plugin built its own libmfx dispatcher + */ +#define MFXUnload GstMFXUnload #endif typedef struct _MsdkSession MsdkSession;