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 /aconfigure.ac | |
| 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 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 3 |
1 files changed, 0 insertions, 3 deletions
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] |