diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-24 21:07:52 +0400 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-24 21:07:52 +0400 |
commit | b48e359ff766d6fef966d706288adcd28e2d2d8b (patch) | |
tree | 76d7922786b1dd8264feb6103f51e788fa71ece9 | |
parent | f9edc2331d8c2d7fe034369c5a3c6b0e1e24362b (diff) |
Remove --disable-dv1394 option
--disable-demuxer=dv1394 should be used instead
Originally committed as revision 10213 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -125,7 +125,6 @@ show_help(){ echo " --disable-v4l disable video4linux grabbing [default=no]" echo " --disable-v4l2 disable video4linux2 grabbing [default=no]" echo " --disable-bktr disable bktr video grabbing [default=no]" - echo " --disable-dv1394 disable DV1394 grabbing [default=no]" echo " --disable-network disable network support [default=no]" echo " --disable-ipv6 disable ipv6 support [default=no]" echo " --disable-zlib disable zlib [default=no]" @@ -594,7 +593,6 @@ CONFIG_LIST=" beos_netserver bktr dc1394 - dv1394 ffmpeg ffplay ffserver @@ -854,7 +852,6 @@ targetos=$(tolower $(uname -s)) # non-library system interfaces audio_oss="yes" bktr="yes" -dv1394="yes" v4l2="yes" v4l="yes" @@ -1112,8 +1109,6 @@ case $targetos in esac LDCONFIG="echo ignoring ldconfig" SHFLAGS=-nostart - # disable Linux things - dv1394="no" # enable BeOS things disabled audio_beos || enable_audio_beos # no need for libm, but the inet stuff @@ -1126,17 +1121,14 @@ case $targetos in osextralibs="-lnet" fi ;; sunos) - dv1394="no" FFSERVERLDFLAGS="" SHFLAGS="-shared -Wl,-h,\$@" add_extralibs "-lsocket -lnsl" ;; netbsd) - dv1394="no" add_extralibs "-lossaudio" ;; openbsd) - dv1394="no" need_memalign="no" LIBOBJFLAGS="\$(PIC)" LDCONFIG="ldconfig -m \$(SHLIBDIR)" @@ -1147,21 +1139,17 @@ case $targetos in add_extralibs "-lossaudio" ;; freebsd) - dv1394="no" need_memalign="no" add_cflags "-pthread" ;; gnu/kfreebsd) - dv1394="no" add_cflags "-pthread" ;; bsd/os) - dv1394="no" osextralibs="-lpoll -lgnugetopt -lm" strip="strip -d" ;; darwin) - dv1394="no" need_memalign="no" SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(SHLIBDIR)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@' @@ -1176,7 +1164,6 @@ case $targetos in mingw32*) targetos=mingw32 shlibdir="$bindir" - dv1394="no" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' if enabled swscaler; then @@ -1196,7 +1183,6 @@ case $targetos in cygwin*) targetos=cygwin shlibdir="$bindir" - dv1394="no" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' if enabled swscaler; then @@ -1213,6 +1199,7 @@ case $targetos in ;; linux) LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS" + dv1394="yes" ;; irix*) targetos=irix |