added ffserver disabling for easier porting
Originally committed as revision 1341 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
17a70fdeef
commit
8154d2e01a
5
Makefile
5
Makefile
@ -19,7 +19,10 @@ EXE=.exe
|
||||
PROG=ffmpeg$(EXE)
|
||||
else
|
||||
EXT=
|
||||
PROG=ffmpeg ffplay ffserver
|
||||
PROG=ffmpeg ffplay
|
||||
ifeq ($(CONFIG_FFSERVER),yes)
|
||||
PROG+=ffserver
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_AUDIO_BEOS),yes)
|
||||
|
9
configure
vendored
9
configure
vendored
@ -71,6 +71,7 @@ mpegaudio_hp="yes"
|
||||
SHFLAGS=-shared
|
||||
netserver="no"
|
||||
need_inet_aton="no"
|
||||
ffserver="yes"
|
||||
LDFLAGS=-Wl,--warn-common
|
||||
FFSLDFLAGS=-Wl,-E
|
||||
|
||||
@ -275,6 +276,8 @@ for opt do
|
||||
;;
|
||||
--disable-mpegaudio-hp) mpegaudio_hp="no"
|
||||
;;
|
||||
--disable-ffserver) ffserver="no"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -487,6 +490,7 @@ echo " --disable-vhook disable video hooking support"
|
||||
echo " --enable-gprof enable profiling with gprof [$gprof]"
|
||||
echo " --disable-mpegaudio-hp faster (but less accurate)"
|
||||
echo " mpegaudio decoding [default=no]"
|
||||
echo " --disable-ffserver disable ffserver build"
|
||||
echo ""
|
||||
echo "NOTE: The object files are build at the place where configure is launched"
|
||||
exit 1
|
||||
@ -704,6 +708,11 @@ if test "$simpleidct" = "yes" ; then
|
||||
echo "#define SIMPLE_IDCT 1" >> $TMPH
|
||||
fi
|
||||
|
||||
if test "$ffserver" = "yes" ; then
|
||||
echo "#define CONFIG_FFSERVER 1" >> $TMPH
|
||||
echo "CONFIG_FFSERVER=yes" >> config.mak
|
||||
fi
|
||||
|
||||
echo "#define restrict $_restrict" >> $TMPH
|
||||
|
||||
# build tree in object directory if source path is different from current one
|
||||
|
Loading…
Reference in New Issue
Block a user