FS-8884: add --disable-libyuv and --disable-libvpx configure args to disable building these libraries

This commit is contained in:
Michael Jerris committed 2016-02-29 12:39:51 -05:00
1 parent d89a0ad52d
commit 1540546cc1
5 files changed
+41 -9

No files matched your search

+2 -4
View File
@@ -1936,9 +1936,9 @@ SWITCH_DECLARE(switch_status_t) switch_img_fit(switch_image_t **srcP, int width,
return SWITCH_STATUS_FALSE;
}
#ifdef SWITCH_HAVE_YUV
static inline uint32_t switch_img_fmt2fourcc(switch_img_fmt_t fmt)
{
#ifdef SWITCH_HAVE_YUV
uint32_t fourcc;
switch(fmt) {
@@ -1972,10 +1972,8 @@ static inline uint32_t switch_img_fmt2fourcc(switch_img_fmt_t fmt)
}
return fourcc;
#else
return 0xFFFFFFFF;
#endif
}
#endif
SWITCH_DECLARE(switch_status_t) switch_img_to_raw(switch_image_t *src, void *dest, switch_size_t size, switch_img_fmt_t fmt)
{
+4 -1
View File
@@ -1876,8 +1876,11 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
switch_loadable_module_load_module("", "CORE_SOFTTIMER_MODULE", SWITCH_FALSE, &err);
switch_loadable_module_load_module("", "CORE_PCM_MODULE", SWITCH_FALSE, &err);
switch_loadable_module_load_module("", "CORE_SPEEX_MODULE", SWITCH_FALSE, &err);
#ifdef SWITCH_HAVE_YUV
#ifdef SWITCH_HAVE_VPX
switch_loadable_module_load_module("", "CORE_VPX_MODULE", SWITCH_FALSE, &err);
#endif
#endif
if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
switch_xml_t mods, ld;
+4
View File
@@ -32,6 +32,8 @@
*/
#include <switch.h>
#ifdef SWITCH_HAVE_YUV
#ifdef SWITCH_HAVE_VPX
#include <vpx/vpx_encoder.h>
#include <vpx/vpx_decoder.h>
#include <vpx/vp8cx.h>
@@ -1269,6 +1271,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_vpx_load)
return SWITCH_STATUS_SUCCESS;
}
#endif
#endif
/* For Emacs:
* Local Variables:
* mode:c