Changeset 5364 for pjproject/trunk/aconfigure.ac

Timestamp:

Jun 29, 2016 4:58:16 AM (8 years ago)

Author:

nanang

Message:

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.

File:

• pjproject/trunk/aconfigure.ac (modified) (2 diffs)

pjproject/trunk/aconfigure.ac

@@ -1066 +1066 @@
                                 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
@@ -1126 +1124 @@
                                      [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
                                       ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale"
-                                      enable_libyuv="no"
                                      ],
                                      [],