From e791baea6f2888e8ed1913a5ae0e9f618dff46c8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 29 Jun 2016 04:58:16 +0000 Subject: 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 --- aconfigure | 2 -- 1 file changed, 2 deletions(-) (limited to 'aconfigure') diff --git a/aconfigure b/aconfigure index 736f1dff..f2e722cd 100755 --- a/aconfigure +++ b/aconfigure @@ -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 -- cgit v1.2.3