Changeset 5306 for pjproject/trunk/pjmedia/src/pjmedia/converter.c

Timestamp:

May 18, 2016 10:11:53 AM (8 years ago)

Author:

riza

Message:

Re #1920: Avoid linking error when video is not enabled.

File:

• pjproject/trunk/pjmedia/src/pjmedia/converter.c (modified) (2 diffs)

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

@@ -30 +30 @@
 static pjmedia_converter_mgr *converter_manager_instance;
 
-#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0)
 PJ_DECL(pj_status_t)
 pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr);
@@ -60 +61 @@
 #endif
 
-#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0)
     status = pjmedia_libswscale_converter_init(mgr);
     if (status != PJ_SUCCESS) {