Changeset 5303

Timestamp:

May 17, 2016 4:01:59 PM (8 years ago)

Author:

riza

Message:

Re #1920: Fix typo on configuration script when trying to detect FFMpeg
package (libavdevice).

Thanks to Alexander Traud for the patch.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/ffmpeg_dev.c (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -6825 +6825 @@
 $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

pjproject/trunk/aconfigure.ac

@@ -1008 +1008 @@
                         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

pjproject/trunk/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c

@@ -40 +40 @@
 
 #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