diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-05-17 16:01:59 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-05-17 16:01:59 +0000 |
| commit | 7e96ebd5c19e3815f0858420bc842e6d9a2a0a2f (patch) | |
| tree | 11deb62da28da43fc27c609c8d308f8fb5fc0e7a | |
| parent | 93a706325b28965ffa4e29d0a742997b57bb7d24 (diff) | |
Re #1920: Fix typo on configuration script when trying to detect FFMpeg
package (libavdevice).
Thanks to Alexander Traud for the patch.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5303 74dad513-b988-da41-8d7b-12977e46ad98
| -rwxr-xr-x | aconfigure | 4 | ||||
| -rw-r--r-- | aconfigure.ac | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/ffmpeg_dev.c | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -6824,9 +6824,9 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="none" { $as_echo "$as_me:${as_lineno-$LINENO}: checking ffmpeg packages" >&5 $as_echo_n "checking ffmpeg packages... " >&6; } av_pkg="" - if $PKG_CONFIG --exists libdevice; then + if $PKG_CONFIG --exists libavdevice; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - av_pkg="$av_pkg libdevice" + av_pkg="$av_pkg libavdevice" fi if $PKG_CONFIG --exists libavformat; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" diff --git a/aconfigure.ac b/aconfigure.ac index 5682e14e..3da3eca2 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -1007,9 +1007,9 @@ AC_ARG_ENABLE(ffmpeg, if test "$PKG_CONFIG" != "none"; then AC_MSG_CHECKING([ffmpeg packages]) av_pkg="" - if $PKG_CONFIG --exists libdevice; then + if $PKG_CONFIG --exists libavdevice; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1" - av_pkg="$av_pkg libdevice" + av_pkg="$av_pkg libavdevice" fi if $PKG_CONFIG --exists libavformat; then ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1" diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c index a456536c..19aec9c6 100644 --- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c +++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c @@ -39,6 +39,7 @@ #if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO != 0 && \ + defined(PJMEDIA_HAS_LIBAVDEVICE) && PJMEDIA_HAS_LIBAVDEVICE != 0 && \ defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0 |