Changeset 5378

Timestamp:

Jul 11, 2016 12:51:12 AM (8 years ago)

Author:

ming

Message:

Re #1937: Do not build libyuv in shared mode if video is disabled.

Thanks to Ross Beer for the report.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• converter.c (modified) (2 diffs)
• converter_libyuv.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/converter.c

@@ -36 +36 @@
 #endif
 
-#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0)
 PJ_DECL(pj_status_t)
 pjmedia_libyuv_converter_init(pjmedia_converter_mgr *mgr);
@@ -62 +63 @@
 #endif
 
-#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0)
     status = pjmedia_libyuv_converter_init(mgr);
     if (status != PJ_SUCCESS) {

pjproject/trunk/pjmedia/src/pjmedia/converter_libyuv.c

@@ -21 +21 @@
 #include <pj/errno.h>
 
-#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0)
 
 #include <libyuv.h>