Changeset 456:bd5be34d0598 in mediastreamer2

Timestamp:

May 4, 2009 1:28:35 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

cleanup swscale/ffmpeg detection.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@459 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/acinclude.m4 (modified) (2 diffs)

linphone/mediastreamer2/acinclude.m4

@@ -67 +67 @@
                 
                 dnl test for ffmpeg presence
-                PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 50.0.0 ],ffmpeg_found=yes , ffmpeg_found=no)
-                dnl workaround for debian...
-                PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 0d.50.0.0 ], ffmpeg_found=yes, ffmpeg_found=no)
+                PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.0.0 ],ffmpeg_found=yes , ffmpeg_found=no)
                 if test x$ffmpeg_found = xno ; then
-                        AC_MSG_ERROR([Could not find ffmpeg headers and library. This is mandatory for video support])
+                        AC_MSG_ERROR([Could not find libavcodec (from ffmpeg) headers and library. This is mandatory for video support])
+                fi
+                PKG_CHECK_MODULES(SWSCALE, [libswscale >= 0.7.0 ],swscale_found=yes , swscale_found=no)
+                if test x$swscale_found = xno ; then
+                        AC_MSG_ERROR([Could not find libswscale (from ffmpeg) headers and library. This is mandatory for video support])
                 fi
 
@@ -95 +97 @@
                 dnl #endif
                 CPPFLAGS_save=$CPPFLAGS
-                CPPFLAGS="$FFMPEG_CFLAGS $CPPFLAGS"
+                CPPFLAGS="SWSCALE_CFLAGS $CPPFLAGS"
                 AC_CHECK_HEADERS(libswscale/swscale.h)
                 CPPFLAGS=$CPPFLAGS_save
-
-                PKG_CHECK_MODULES(SWSCALE, [libswscale >= 0.5.0 ], [echo "We have libswscale"], 
-                        [echo "We don't have libswscale, let's hope its symbols are in libavcodec"] )
 
                 if test "$libsdldir" != "none" ; then