Changeset 5378


Ignore:
Timestamp:
Jul 11, 2016 12:51:12 AM (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/converter.c

    r5364 r5378  
    3636#endif 
    3737 
    38 #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 
     38#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     39    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) 
    3940PJ_DECL(pj_status_t) 
    4041pjmedia_libyuv_converter_init(pjmedia_converter_mgr *mgr); 
     
    6263#endif 
    6364 
    64 #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 
     65#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     66    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) 
    6567    status = pjmedia_libyuv_converter_init(mgr); 
    6668    if (status != PJ_SUCCESS) { 
  • pjproject/trunk/pjmedia/src/pjmedia/converter_libyuv.c

    r5360 r5378  
    2121#include <pj/errno.h> 
    2222 
    23 #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 
     23#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     24    defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) 
    2425 
    2526#include <libyuv.h> 
Note: See TracChangeset for help on using the changeset viewer.