diff options
| -rwxr-xr-x | aconfigure | 2 | ||||
| -rw-r--r-- | aconfigure.ac | 3 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/converter.c | 14 |
3 files changed, 7 insertions, 12 deletions
@@ -6919,7 +6919,6 @@ $as_echo_n "checking ffmpeg packages... " >&6; } if $PKG_CONFIG --exists libswscale; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" av_pkg="$av_pkg libswscale" - enable_libyuv="no" fi if $PKG_CONFIG --exists libavutil; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" @@ -7158,7 +7157,6 @@ $as_echo "$ac_cv_lib_swscale_sws_scale" >&6; } if test "x$ac_cv_lib_swscale_sws_scale" = xyes; then : ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" - enable_libyuv="no" fi diff --git a/aconfigure.ac b/aconfigure.ac index bc4eb456..d51c2224 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -1065,8 +1065,6 @@ AC_ARG_ENABLE(ffmpeg, if $PKG_CONFIG --exists libswscale; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" av_pkg="$av_pkg libswscale" - dnl # disable libyuv when libswscale is enabled - enable_libyuv="no" fi if $PKG_CONFIG --exists libavutil; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1" @@ -1125,7 +1123,6 @@ AC_ARG_ENABLE(ffmpeg, sws_scale, [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1" ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale" - enable_libyuv="no" ], [], [-lavutil] 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 |