Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/converter_libyuv.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/converter_libyuv.c (modified) (2 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/converter_libyuv.c

@@ -21 +21 @@
 #include <pj/errno.h>
 
-#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
-
-#include  <libyuv.h>
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
+    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0)
+
+#include <libyuv.h>
 
 static pj_status_t factory_create_converter(pjmedia_converter_factory *cf,
@@ -652 +653 @@
 }
 
-#ifdef _MSC_VER
-#   pragma comment(lib, "libyuv.lib")
-#endif
-
 #endif //#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0