From 75e0e9499ed46428d7b07c7054c2f34f78a54437 Mon Sep 17 00:00:00 2001 From: Riza Sulistyo Date: Wed, 18 May 2016 10:11:53 +0000 Subject: Re #1920: Avoid linking error when video is not enabled. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5306 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/converter.c | 6 ++++-- pjmedia/src/pjmedia/converter_libswscale.c | 5 +++-- pjmedia/src/pjmedia/ffmpeg_util.c | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c index 11948467..f42a3e5b 100644 --- a/pjmedia/src/pjmedia/converter.c +++ b/pjmedia/src/pjmedia/converter.c @@ -29,7 +29,8 @@ struct pjmedia_converter_mgr 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); #endif @@ -59,7 +60,8 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool, } #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) { PJ_PERROR(4,(THIS_FILE, status, diff --git a/pjmedia/src/pjmedia/converter_libswscale.c b/pjmedia/src/pjmedia/converter_libswscale.c index 608aa492..6e2d5fca 100644 --- a/pjmedia/src/pjmedia/converter_libswscale.c +++ b/pjmedia/src/pjmedia/converter_libswscale.c @@ -19,7 +19,8 @@ #include #include -#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" #include @@ -205,4 +206,4 @@ pjmedia_libswscale_converter_shutdown(pjmedia_converter_mgr *mgr, # pragma comment( lib, "swscale.lib") #endif -#endif /* #if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL */ +#endif /* PJMEDIA_HAS_LIBSWSCALE */ diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c index ba749412..2716b3de 100644 --- a/pjmedia/src/pjmedia/ffmpeg_util.c +++ b/pjmedia/src/pjmedia/ffmpeg_util.c @@ -21,7 +21,8 @@ #include #include -#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" #include @@ -193,4 +194,4 @@ pj_status_t CodecID_to_pjmedia_format_id(unsigned codec_id, # pragma comment( lib, "avutil.lib") #endif -#endif /* #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL */ +#endif /* PJMEDIA_HAS_LIBAVFORMAT */ -- cgit v1.2.3