diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2014-09-17 10:38:20 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-10-14 09:55:59 +0200 |
commit | 4bd3c3599029fa46e7dad5698fb1e50d2d0aa0f7 (patch) | |
tree | 201ffd46ef23353fdc66ccbde6de38e99b7e0b27 | |
parent | c6124397ac9a73a583d71068694535617e94e423 (diff) | |
download | gstreamer-plugins-bad-4bd3c3599029fa46e7dad5698fb1e50d2d0aa0f7.tar.gz |
applemedia: Do weak linking with the VideoToolbox framework
It does not exist on older OSX and iOS but we still want to
be able to use it when it's available.
-rw-r--r-- | sys/applemedia/Makefile.am | 2 | ||||
-rw-r--r-- | sys/applemedia/plugin.m | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/applemedia/Makefile.am b/sys/applemedia/Makefile.am index 36f3b9e24..746744245 100644 --- a/sys/applemedia/Makefile.am +++ b/sys/applemedia/Makefile.am @@ -96,5 +96,5 @@ libgstapplemedia_la_SOURCES += \ vtenc.c \ vtdec.c -libgstapplemedia_la_LDFLAGS += -Wl,-framework -Wl,VideoToolbox +libgstapplemedia_la_LDFLAGS += -Wl,-weak_framework -Wl,VideoToolbox endif diff --git a/sys/applemedia/plugin.m b/sys/applemedia/plugin.m index e85f67a6a..b9d82b3a7 100644 --- a/sys/applemedia/plugin.m +++ b/sys/applemedia/plugin.m @@ -90,8 +90,11 @@ plugin_init (GstPlugin * plugin) res &= gst_element_register (plugin, "atdec", GST_RANK_MARGINAL, GST_TYPE_ATDEC); #ifdef HAVE_VIDEOTOOLBOX - res &= gst_element_register (plugin, "vtdec", GST_RANK_PRIMARY, GST_TYPE_VTDEC); - gst_vtenc_register_elements (plugin); + /* Check if the framework actually exists at runtime */ + if (VTCompressionSessionCreate != NULL) { + res &= gst_element_register (plugin, "vtdec", GST_RANK_PRIMARY, GST_TYPE_VTDEC); + gst_vtenc_register_elements (plugin); + } #endif return res; |