FS-7655: attempt to make libvpx and libyuv optional (none of the video features will work without them) The following modules require these libraries to be installed still: mod_av mod_cv mod_fsv mod_mp4v2 mod_openh264 mod_vpx mod_imagick mod_vpx mod_yuv mod_png mod_vlc

This commit is contained in:
Michael Jerris committed 2015-06-16 18:24:35 -05:00
1 parent 601a1e8c1a
commit 4ad0aa91a4
16 files changed
+436 -12

No files matched your search

@@ -6,3 +6,4 @@ mod_local_stream_la_SOURCES = mod_local_stream.c
mod_local_stream_la_CFLAGS = $(AM_CFLAGS)
mod_local_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_local_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared
@@ -284,7 +284,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
if (is_open) {
if (switch_core_file_has_video(use_fh)) {
if (switch_core_has_video() && switch_core_file_has_video(use_fh)) {
switch_frame_t vid_frame = { 0 };
if (switch_core_file_read_video(use_fh, &vid_frame, SVR_FLUSH) == SWITCH_STATUS_SUCCESS) {
@@ -1124,7 +1124,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load)
file_interface->file_open = local_stream_file_open;
file_interface->file_close = local_stream_file_close;
file_interface->file_read = local_stream_file_read;
file_interface->file_read_video = local_stream_file_read_video;
if (switch_core_has_video()) {
file_interface->file_read_video = local_stream_file_read_video;
}
if (switch_event_bind(modname, SWITCH_EVENT_SHUTDOWN, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event handler!\n");