[Iaxclient-cvs] SF.net SVN: iaxclient: [1132] trunk

[<do...@us...>]

Revision: 1132
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1132&view=rev
Author:   dohpaz
Date:     2007-09-12 12:54:25 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
Add ffmpeg support to autotools files. Tracker Patch# 1793310.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/lib/Makefile.am

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-09-12 19:39:12 UTC (rev 1131)
+++ trunk/configure.ac	2007-09-12 19:54:25 UTC (rev 1132)
@@ -135,6 +135,13 @@
          [Theora support])],,
       with_theora="auto")
 
+AC_ARG_WITH(ffmpeg,
+      [AS_HELP_STRING([--with-ffmpeg],
+         [FFmpeg support])],
+      FFMPEG="${with_ffmpeg}",
+      with_ffmpeg="no")
+
+
 if test ! "x$enable_clients" = "xauto"; then
    for client in ${enable_clients}; do
       case "$client" in
@@ -232,6 +239,22 @@
 fi
 AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
 
+has_ffmpeg=no
+if test ! x$with_ffmpeg = xno; then
+PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes)
+if test x$has_ffmpeg = xyes; then
+   AC_DEFINE(USE_FFMPEG, 1, [FFMPEG])
+   PKG_REQUIRES="$PKG_REQUIRES ffmpeg"
+elif test ! x$with_ffmpeg = xauto ; then
+   AC_MSG_ERROR([
+      FFmpeg is required to build this package!
+      please see http://ffmpeg.mplayerhq.hu/ for how to
+      obtain a copy.
+   ])
+fi
+fi
+AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
+
 PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
 PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)

Modified: trunk/lib/Makefile.am
===================================================================
--- trunk/lib/Makefile.am	2007-09-12 19:39:12 UTC (rev 1131)
+++ trunk/lib/Makefile.am	2007-09-12 19:54:25 UTC (rev 1132)
@@ -98,6 +98,12 @@
 AM_CFLAGS += $(THEORA_CFLAGS)
 endif
 
+if FFMPEG
+SRCS += codec_ffmpeg.c codec_ffmpeg.h
+libiaxclient_la_LIBADD += $(FFMPEG_LIBS)
+AM_CFLAGS += $(FFMPEG_CFLAGS)
+endif
+
 SRCS_LIBGSM=					\
 	gsm/src/add.c				\
 	gsm/src/code.c				\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.