[Ffmpeg-cvslog] r6871 - in trunk: Makefile configure

[diego]

Author: diego
Date: Thu Nov  2 18:09:47 2006
New Revision: 6871

Modified:
   trunk/Makefile
   trunk/configure

Log:
Add option to disable ffmpeg build.
Patch taken from the Debian package by Sam Hocevar.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Nov  2 18:09:47 2006
@@ -11,11 +11,13 @@
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
+ifeq ($(CONFIG_FFMPEG),yes)
 MANPAGES=doc/ffmpeg.1
 PROGS_G+=ffmpeg_g$(EXESUF)
 PROGS+=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
 QTFASTSTART=qt-faststart$(EXESUF)
+endif
 
 ifeq ($(CONFIG_FFSERVER),yes)
 MANPAGES+=doc/ffserver.1

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Nov  2 18:09:47 2006
@@ -98,6 +98,7 @@
   echo "  --disable-mpegaudio-hp   faster (but less accurate)"
   echo "                           MPEG audio decoding [default=no]"
   echo "  --disable-protocols      disable I/O protocols support [default=no]"
+  echo "  --disable-ffmpeg         disable ffmpeg build"
   echo "  --disable-ffserver       disable ffserver build"
   echo "  --disable-ffplay         disable ffplay build"
   echo "  --enable-small           optimize for size instead of speed"
@@ -455,6 +456,7 @@
 netserver="no"
 need_inet_aton="no"
 protocols="yes"
+ffmpeg="yes"
 ffserver="yes"
 ffplay="yes"
 LIBOBJFLAGS=""
@@ -810,6 +812,8 @@
   ;;
   --disable-protocols) protocols="no"; network="no"; ffserver="no"
   ;;
+  --disable-ffmpeg) ffmpeg="no"
+  ;;
   --disable-ffserver) ffserver="no"
   ;;
   --disable-ffplay) ffplay="no"
@@ -2104,6 +2108,11 @@
   echo "CONFIG_PROTOCOLS=yes" >> config.mak
 fi
 
+if test "$ffmpeg" = "yes" ; then
+  echo "#define CONFIG_FFMPEG 1" >> $TMPH
+  echo "CONFIG_FFMPEG=yes" >> config.mak
+fi
+
 if test "$ffserver" = "yes" ; then
   echo "#define CONFIG_FFSERVER 1" >> $TMPH
   echo "CONFIG_FFSERVER=yes" >> config.mak