sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5306 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Riza Sulistyo 2016-05-18 10:11:53 +00:00
parent 45a0a37a55
commit a43bfb036b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pjmedia/src/pjmedia/converter.c
View File

@ -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,

5
pjmedia/src/pjmedia/converter_libswscale.c
View File

@ -19,7 +19,8 @@
#include <pjmedia/converter.h>
#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"
#include <libswscale/swscale.h>
@ -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 */

5
pjmedia/src/pjmedia/ffmpeg_util.c
View File

@ -21,7 +21,8 @@
#include <pj/log.h>
#include <pj/string.h>
#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 <libavformat/avformat.h>
@ -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 */