diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-06-29 04:58:16 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-06-29 04:58:16 +0000 |
| commit | e791baea6f2888e8ed1913a5ae0e9f618dff46c8 (patch) | |
| tree | f0164880cbee0e89f04fe844f8e17e0f91963f4f /pjmedia | |
| parent | ab23651f0272ef8976a962a2b4fd5572cd984e8c (diff) | |
Re #1937: Keep libyuv enabled in configure script even when ffmpeg swscale is detected because video orientation feature requires libyuv. However, put ffmpeg swscale priority higher than libyuv in video converter.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5364 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/converter.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c index f42a3e5b..8f177373 100644 --- a/pjmedia/src/pjmedia/converter.c +++ b/pjmedia/src/pjmedia/converter.c @@ -52,20 +52,20 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool, if (!converter_manager_instance) converter_manager_instance = mgr; -#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 - status = pjmedia_libyuv_converter_init(mgr); +#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, - "Error initializing libyuv converter")); + "Error initializing libswscale converter")); } #endif -#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ - defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0) - status = pjmedia_libswscale_converter_init(mgr); +#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 + status = pjmedia_libyuv_converter_init(mgr); if (status != PJ_SUCCESS) { PJ_PERROR(4,(THIS_FILE, status, - "Error initializing libswscale converter")); + "Error initializing libyuv converter")); } #endif |