From af9e42d13048abedd22c034e13abc848179df72b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 2 Mar 2020 16:38:17 +0530 Subject: [PATCH] Cerbero has moved from gnutls+openssl to only openssl --- .../tutorials/android/android-tutorial-4/jni/Android.mk | 2 +- .../tutorials/android/android-tutorial-5/jni/Android.mk | 2 +- examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m | 8 ++++---- examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m | 8 ++++---- examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m | 8 ++++---- examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m | 8 ++++---- examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/tutorials/android/android-tutorial-4/jni/Android.mk b/examples/tutorials/android/android-tutorial-4/jni/Android.mk index df2186816f..b0514a6572 100644 --- a/examples/tutorials/android/android-tutorial-4/jni/Android.mk +++ b/examples/tutorials/android/android-tutorial-4/jni/Android.mk @@ -29,6 +29,6 @@ endif GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) -G_IO_MODULES := gnutls +G_IO_MODULES := openssl GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/examples/tutorials/android/android-tutorial-5/jni/Android.mk b/examples/tutorials/android/android-tutorial-5/jni/Android.mk index b696566216..ca00251a1f 100755 --- a/examples/tutorials/android/android-tutorial-5/jni/Android.mk +++ b/examples/tutorials/android/android-tutorial-5/jni/Android.mk @@ -29,6 +29,6 @@ endif GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) -G_IO_MODULES := gnutls +G_IO_MODULES := openssl GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m b/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m index 592dbf8aea..f5d9f5f50e 100644 --- a/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m +++ b/examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m @@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp); GST_PLUGIN_STATIC_DECLARE(nle); #endif -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_DECLARE(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_DECLARE(openssl); #endif void @@ -564,8 +564,8 @@ gst_ios_init (void) ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_LOAD(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_LOAD(openssl); #endif if (ca_certificates) { diff --git a/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m b/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m index 592dbf8aea..f5d9f5f50e 100644 --- a/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m +++ b/examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m @@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp); GST_PLUGIN_STATIC_DECLARE(nle); #endif -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_DECLARE(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_DECLARE(openssl); #endif void @@ -564,8 +564,8 @@ gst_ios_init (void) ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_LOAD(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_LOAD(openssl); #endif if (ca_certificates) { diff --git a/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m b/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m index 592dbf8aea..f5d9f5f50e 100644 --- a/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m +++ b/examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m @@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp); GST_PLUGIN_STATIC_DECLARE(nle); #endif -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_DECLARE(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_DECLARE(openssl); #endif void @@ -564,8 +564,8 @@ gst_ios_init (void) ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_LOAD(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_LOAD(openssl); #endif if (ca_certificates) { diff --git a/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m b/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m index 592dbf8aea..f5d9f5f50e 100644 --- a/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m +++ b/examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m @@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp); GST_PLUGIN_STATIC_DECLARE(nle); #endif -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_DECLARE(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_DECLARE(openssl); #endif void @@ -564,8 +564,8 @@ gst_ios_init (void) ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_LOAD(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_LOAD(openssl); #endif if (ca_certificates) { diff --git a/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m b/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m index 592dbf8aea..f5d9f5f50e 100644 --- a/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m +++ b/examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m @@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp); GST_PLUGIN_STATIC_DECLARE(nle); #endif -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_DECLARE(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_DECLARE(openssl); #endif void @@ -564,8 +564,8 @@ gst_ios_init (void) ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); -#if defined(GST_IOS_GIO_MODULE_GNUTLS) - GST_G_IO_MODULE_LOAD(gnutls); +#if defined(GST_IOS_GIO_MODULE_OPENSSL) + GST_G_IO_MODULE_LOAD(openssl); #endif if (ca_certificates) {