[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog |
Date: |
Thu, 21 Dec 2006 22:17:02 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/12/21 22:17:02
Modified files:
macros : ffmpeg.m4
. : ChangeLog
Log message:
* macros/ffmpeg.m4: Also check for the dc1394_control library,
needed on Ubuntu with ffmpeg.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1991&r2=1.1992
Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/ffmpeg.m4 4 Nov 2006 18:13:22 -0000 1.24
+++ macros/ffmpeg.m4 21 Dec 2006 22:17:02 -0000 1.25
@@ -15,7 +15,9 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: ffmpeg.m4,v 1.24 2006/11/04 18:13:22 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.25 2006/12/21 22:17:02 rsavoye Exp $
+
+dnl struct AVFormatParameters' has no member named 'prealloced_context'
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -212,6 +214,29 @@
AC_MSG_CHECKING([for libtheora library])
AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+ AC_MSG_CHECKING([for dc1394 library])
+ AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+
+ if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists libdc1394 && libtheora=`$PKG_CONFIG --libs
libdc1394`
+ else
+ libtdc1394=""
+ fi
+
+ if test x"${libdc1394}" = x; then
+ AC_CHECK_LIB(dc1394_control, dc1394_is_camera,
+ [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394_control"],
+ [
+ if test -f $topdir/libdc1394_control.so; then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394_control"
+ fi
+ ])
+ else
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdc1394_control}"
+ fi
+ AC_MSG_CHECKING([for the dc1394_control library])
+ AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+
fi
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -b -r1.1991 -r1.1992
--- ChangeLog 21 Dec 2006 17:24:57 -0000 1.1991
+++ ChangeLog 21 Dec 2006 22:17:02 -0000 1.1992
@@ -1,3 +1,8 @@
+2006-12-21 Rob Savoye <address@hidden>
+
+ * macros/ffmpeg.m4: Also check for the dc1394_control library,
+ needed on Ubuntu with ffmpeg.
+
2006-12-21 Tomas Groth Christensen <address@hidden>
* backend/sound_handler_sdl.cpp: Fixed bug #18244: Forgot to
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog,
Rob Savoye <=