Changeset 5306


Ignore:
Timestamp:
May 18, 2016 10:11:53 AM (4 years ago)
Author:
riza
Message:

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

Location:
pjproject/trunk/pjmedia/src/pjmedia
Files:
3 edited

Legend:

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

    r4875 r5306  
    3030static pjmedia_converter_mgr *converter_manager_instance; 
    3131 
    32 #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL 
     32#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     33    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0) 
    3334PJ_DECL(pj_status_t) 
    3435pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr); 
     
    6061#endif 
    6162 
    62 #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL 
     63#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     64    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0) 
    6365    status = pjmedia_libswscale_converter_init(mgr); 
    6466    if (status != PJ_SUCCESS) { 
  • pjproject/trunk/pjmedia/src/pjmedia/converter_libswscale.c

    r5198 r5306  
    2020#include <pj/errno.h> 
    2121 
    22 #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL 
     22#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     23    defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0) 
    2324 
    2425#include "ffmpeg_util.h" 
     
    206207#endif 
    207208 
    208 #endif /* #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL */ 
     209#endif /* PJMEDIA_HAS_LIBSWSCALE */ 
  • pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.c

    r5271 r5306  
    2222#include <pj/string.h> 
    2323 
    24 #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL 
     24#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ 
     25    defined(PJMEDIA_HAS_LIBAVFORMAT) && (PJMEDIA_HAS_LIBAVFORMAT != 0) 
    2526 
    2627#include "ffmpeg_util.h" 
     
    194195#endif 
    195196 
    196 #endif  /* #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL */ 
     197#endif  /* PJMEDIA_HAS_LIBAVFORMAT */ 
Note: See TracChangeset for help on using the changeset viewer.