Changeset 5306 for pjproject/trunk/pjmedia/src/pjmedia/converter_libswscale.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_libswscale.c (modified) (2 diffs)

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 */