lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.8+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-05-27 22:57:19 +02:00
parent 8b2e5f2130
commit 8e020cdacb
115 changed files with 1767 additions and 10949 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/obs-outputs/CMakeLists.txt
View file

@ -156,6 +156,13 @@ set(obs-outputs_SOURCES
flv-mux.c
net-if.c)
if(WIN32)
set(MODULE_DESCRIPTION "OBS output module")
configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in obs-outputs.rc)
list(APPEND obs-outputs_SOURCES
obs-outputs.rc)
endif()
add_library(obs-outputs MODULE
${ftl_SOURCES}
${ftl_HEADERS}

5
plugins/obs-outputs/librtmp/rtmp.c
View file

@ -360,6 +360,8 @@ error:
mbedtls_x509_crt_free(chain);
free(chain);
r->RTMP_TLS_ctx->cacert = NULL;
#else /* USE_MBEDTLS */
UNUSED_PARAMETER(r);
#endif /* USE_MBEDTLS */
}
@ -407,6 +409,7 @@ RTMP_TLS_Init(RTMP *r)
SSL_CTX_set_default_verify_paths(RTMP_TLS_ctx);
#endif
#else
UNUSED_PARAMETER(r);
#endif
}
@ -429,6 +432,8 @@ RTMP_TLS_Free(RTMP *r) {
// NO mbedtls_net_free() BECAUSE WE SET IT UP BY HAND!
free(r->RTMP_TLS_ctx);
r->RTMP_TLS_ctx = NULL;
#else
UNUSED_PARAMETER(r);
#endif
}