Changeset 5306

Timestamp:

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

Author:

riza

Message:

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

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• converter.c (modified) (2 diffs)
• converter_libswscale.c (modified) (2 diffs)
• ffmpeg_util.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) {

pjproject/trunk/pjmedia/src/pjmedia/converter_libswscale.c

@@ -20 +20 @@
 #include <pj/errno.h>
 
-#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0)
 
 #include "ffmpeg_util.h"
@@ -206 +207 @@
 #endif
 
-#endif /* #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL */
+#endif /* PJMEDIA_HAS_LIBSWSCALE */

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.c

@@ -22 +22 @@
 #include <pj/string.h>
 
-#if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBAVFORMAT) && (PJMEDIA_HAS_LIBAVFORMAT != 0)
 
 #include "ffmpeg_util.h"
@@ -194 +195 @@
 #endif
 
-#endif  /* #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL */
+#endif  /* PJMEDIA_HAS_LIBAVFORMAT */