From 786b30af267d69b7cf7d06c72b1d5f80d16f9a88 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 2 Nov 2006 17:09:47 +0000 Subject: [PATCH] Add option to disable ffmpeg build. Patch taken from the Debian package by Sam Hocevar. Originally committed as revision 6871 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 2 ++ configure | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Makefile b/Makefile index 8269847f8f..09e5fc6d88 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,13 @@ CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ -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 diff --git a/configure b/configure index 22be3a3b2e..462d2530e9 100755 --- a/configure +++ b/configure @@ -98,6 +98,7 @@ show_help(){ 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 @@ VHOOKSHFLAGS='$(SHFLAGS)' netserver="no" need_inet_aton="no" protocols="yes" +ffmpeg="yes" ffserver="yes" ffplay="yes" LIBOBJFLAGS="" @@ -810,6 +812,8 @@ for opt do ;; --disable-protocols) protocols="no"; network="no"; ffserver="no" ;; + --disable-ffmpeg) ffmpeg="no" + ;; --disable-ffserver) ffserver="no" ;; --disable-ffplay) ffplay="no" @@ -2104,6 +2108,11 @@ if test "$protocols" = "yes" ; then 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