mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Cerbero has moved from gnutls+openssl to only openssl

Browse source
This commit is contained in:
Nirbheek Chauhan 2020-03-02 16:38:17 +05:30
parent 254ce57b07
commit af9e42d130
7 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/tutorials/android/android-tutorial-4/jni/Android.mk
View file

@ -29,6 +29,6 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) 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 GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

2
examples/tutorials/android/android-tutorial-5/jni/Android.mk
View file

@ -29,6 +29,6 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) 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 GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

8
examples/tutorials/xcode iOS/Tutorial 1/gst_ios_init.m
View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle); GST_PLUGIN_STATIC_DECLARE(nle);
#endif #endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(gnutls); GST_G_IO_MODULE_DECLARE(openssl);
#endif #endif
void void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(gnutls); GST_G_IO_MODULE_LOAD(openssl);
#endif #endif
if (ca_certificates) { if (ca_certificates) {

8
examples/tutorials/xcode iOS/Tutorial 2/gst_ios_init.m
View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle); GST_PLUGIN_STATIC_DECLARE(nle);
#endif #endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(gnutls); GST_G_IO_MODULE_DECLARE(openssl);
#endif #endif
void void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(gnutls); GST_G_IO_MODULE_LOAD(openssl);
#endif #endif
if (ca_certificates) { if (ca_certificates) {

8
examples/tutorials/xcode iOS/Tutorial 3/gst_ios_init.m
View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle); GST_PLUGIN_STATIC_DECLARE(nle);
#endif #endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(gnutls); GST_G_IO_MODULE_DECLARE(openssl);
#endif #endif
void void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(gnutls); GST_G_IO_MODULE_LOAD(openssl);
#endif #endif
if (ca_certificates) { if (ca_certificates) {

8
examples/tutorials/xcode iOS/Tutorial 4/gst_ios_init.m
View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle); GST_PLUGIN_STATIC_DECLARE(nle);
#endif #endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(gnutls); GST_G_IO_MODULE_DECLARE(openssl);
#endif #endif
void void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(gnutls); GST_G_IO_MODULE_LOAD(openssl);
#endif #endif
if (ca_certificates) { if (ca_certificates) {

8
examples/tutorials/xcode iOS/Tutorial 5/gst_ios_init.m
View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle); GST_PLUGIN_STATIC_DECLARE(nle);
#endif #endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(gnutls); GST_G_IO_MODULE_DECLARE(openssl);
#endif #endif
void void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL); ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE); g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS) #if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(gnutls); GST_G_IO_MODULE_LOAD(openssl);
#endif #endif
if (ca_certificates) { if (ca_certificates) {