Commit 77d3bfe2 authored by Måns Rullgård's avatar Måns Rullgård

remove extraneous per-OS disabling of video4linux[2]

Originally committed as revision 7910 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f6f14752
...@@ -793,8 +793,6 @@ case $targetos in ...@@ -793,8 +793,6 @@ case $targetos in
SHFLAGS=-nostart SHFLAGS=-nostart
# disable Linux things # disable Linux things
audio_oss="no" audio_oss="no"
video4linux="no"
video4linux2="no"
dv1394="no" dv1394="no"
# enable BeOS things # enable BeOS things
audio_beos="yes" audio_beos="yes"
...@@ -808,8 +806,6 @@ case $targetos in ...@@ -808,8 +806,6 @@ case $targetos in
extralibs="-lnet" extralibs="-lnet"
fi ;; fi ;;
SunOS) SunOS)
video4linux="no"
video4linux2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
make="gmake" make="gmake"
...@@ -819,8 +815,6 @@ case $targetos in ...@@ -819,8 +815,6 @@ case $targetos in
add_extralibs "-lsocket -lnsl" add_extralibs "-lsocket -lnsl"
;; ;;
NetBSD) NetBSD)
video4linux="no"
video4linux2="no"
bktr="yes" bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
...@@ -828,8 +822,6 @@ case $targetos in ...@@ -828,8 +822,6 @@ case $targetos in
add_extralibs "-lossaudio" add_extralibs "-lossaudio"
;; ;;
OpenBSD) OpenBSD)
video4linux="no"
video4linux2="no"
bktr="yes" bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
...@@ -844,8 +836,6 @@ case $targetos in ...@@ -844,8 +836,6 @@ case $targetos in
add_extralibs "-lossaudio" add_extralibs "-lossaudio"
;; ;;
FreeBSD) FreeBSD)
video4linux="no"
video4linux2="no"
bktr="yes" bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
...@@ -854,16 +844,12 @@ case $targetos in ...@@ -854,16 +844,12 @@ case $targetos in
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
GNU/kFreeBSD) GNU/kFreeBSD)
video4linux="no"
video4linux2="no"
bktr="yes" bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
add_cflags "-pthread" add_cflags "-pthread"
;; ;;
BSD/OS) BSD/OS)
video4linux="no"
video4linux2="no"
bktr="yes" bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
...@@ -873,8 +859,6 @@ case $targetos in ...@@ -873,8 +859,6 @@ case $targetos in
;; ;;
Darwin) Darwin)
cc="cc" cc="cc"
video4linux="no"
video4linux2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
need_memalign="no" need_memalign="no"
...@@ -896,8 +880,6 @@ case $targetos in ...@@ -896,8 +880,6 @@ case $targetos in
CYGWIN*) CYGWIN*)
targetos=CYGWIN targetos=CYGWIN
shlibdir="$bindir" shlibdir="$bindir"
video4linux="no"
video4linux2="no"
audio_oss="yes" audio_oss="yes"
dv1394="no" 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'
...@@ -916,8 +898,6 @@ case $targetos in ...@@ -916,8 +898,6 @@ case $targetos in
IRIX*) IRIX*)
targetos=IRIX targetos=IRIX
ranlib="echo ignoring ranlib" ranlib="echo ignoring ranlib"
video4linux="no"
video4linux2="no"
audio_oss="no" audio_oss="no"
make="gmake" make="gmake"
;; ;;
...@@ -937,8 +917,6 @@ case $targetos in ...@@ -937,8 +917,6 @@ case $targetos in
EXESUF=".exe" EXESUF=".exe"
extralibs="" extralibs=""
pkg_requires="" pkg_requires=""
video4linux="no"
video4linux2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
ffserver="no" ffserver="no"
...@@ -1203,8 +1181,6 @@ you do not need to pass additional options. ...@@ -1203,8 +1181,6 @@ you do not need to pass additional options.
EOF EOF
exit 1 exit 1
fi fi
video4linux="no"
video4linux2="no"
audio_oss="no" audio_oss="no"
dv1394="no" dv1394="no"
dc1394="no" dc1394="no"
......
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