Commit b48e359f authored by Ramiro Polla's avatar Ramiro Polla

Remove --disable-dv1394 option

--disable-demuxer=dv1394 should be used instead

Originally committed as revision 10213 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f9edc233
...@@ -125,7 +125,6 @@ show_help(){ ...@@ -125,7 +125,6 @@ show_help(){
echo " --disable-v4l disable video4linux grabbing [default=no]" echo " --disable-v4l disable video4linux grabbing [default=no]"
echo " --disable-v4l2 disable video4linux2 grabbing [default=no]" echo " --disable-v4l2 disable video4linux2 grabbing [default=no]"
echo " --disable-bktr disable bktr video 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-network disable network support [default=no]"
echo " --disable-ipv6 disable ipv6 support [default=no]" echo " --disable-ipv6 disable ipv6 support [default=no]"
echo " --disable-zlib disable zlib [default=no]" echo " --disable-zlib disable zlib [default=no]"
...@@ -594,7 +593,6 @@ CONFIG_LIST=" ...@@ -594,7 +593,6 @@ CONFIG_LIST="
beos_netserver beos_netserver
bktr bktr
dc1394 dc1394
dv1394
ffmpeg ffmpeg
ffplay ffplay
ffserver ffserver
...@@ -854,7 +852,6 @@ targetos=$(tolower $(uname -s)) ...@@ -854,7 +852,6 @@ targetos=$(tolower $(uname -s))
# non-library system interfaces # non-library system interfaces
audio_oss="yes" audio_oss="yes"
bktr="yes" bktr="yes"
dv1394="yes"
v4l2="yes" v4l2="yes"
v4l="yes" v4l="yes"
...@@ -1112,8 +1109,6 @@ case $targetos in ...@@ -1112,8 +1109,6 @@ case $targetos in
esac esac
LDCONFIG="echo ignoring ldconfig" LDCONFIG="echo ignoring ldconfig"
SHFLAGS=-nostart SHFLAGS=-nostart
# disable Linux things
dv1394="no"
# enable BeOS things # enable BeOS things
disabled audio_beos || enable_audio_beos disabled audio_beos || enable_audio_beos
# no need for libm, but the inet stuff # no need for libm, but the inet stuff
...@@ -1126,17 +1121,14 @@ case $targetos in ...@@ -1126,17 +1121,14 @@ case $targetos in
osextralibs="-lnet" osextralibs="-lnet"
fi ;; fi ;;
sunos) sunos)
dv1394="no"
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
SHFLAGS="-shared -Wl,-h,\$@" SHFLAGS="-shared -Wl,-h,\$@"
add_extralibs "-lsocket -lnsl" add_extralibs "-lsocket -lnsl"
;; ;;
netbsd) netbsd)
dv1394="no"
add_extralibs "-lossaudio" add_extralibs "-lossaudio"
;; ;;
openbsd) openbsd)
dv1394="no"
need_memalign="no" need_memalign="no"
LIBOBJFLAGS="\$(PIC)" LIBOBJFLAGS="\$(PIC)"
LDCONFIG="ldconfig -m \$(SHLIBDIR)" LDCONFIG="ldconfig -m \$(SHLIBDIR)"
...@@ -1147,21 +1139,17 @@ case $targetos in ...@@ -1147,21 +1139,17 @@ case $targetos in
add_extralibs "-lossaudio" add_extralibs "-lossaudio"
;; ;;
freebsd) freebsd)
dv1394="no"
need_memalign="no" need_memalign="no"
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
gnu/kfreebsd) gnu/kfreebsd)
dv1394="no"
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
bsd/os) bsd/os)
dv1394="no"
osextralibs="-lpoll -lgnugetopt -lm" osextralibs="-lpoll -lgnugetopt -lm"
strip="strip -d" strip="strip -d"
;; ;;
darwin) darwin)
dv1394="no"
need_memalign="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" 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/$@' VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@'
...@@ -1176,7 +1164,6 @@ case $targetos in ...@@ -1176,7 +1164,6 @@ case $targetos in
mingw32*) mingw32*)
targetos=mingw32 targetos=mingw32
shlibdir="$bindir" shlibdir="$bindir"
dv1394="no"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
if enabled swscaler; then if enabled swscaler; then
...@@ -1196,7 +1183,6 @@ case $targetos in ...@@ -1196,7 +1183,6 @@ case $targetos in
cygwin*) cygwin*)
targetos=cygwin targetos=cygwin
shlibdir="$bindir" shlibdir="$bindir"
dv1394="no"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
if enabled swscaler; then if enabled swscaler; then
...@@ -1213,6 +1199,7 @@ case $targetos in ...@@ -1213,6 +1199,7 @@ case $targetos in
;; ;;
linux) linux)
LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS" LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
dv1394="yes"
;; ;;
irix*) irix*)
targetos=irix targetos=irix
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment