summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-19 17:03:28 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-19 17:03:28 +0000
commite696ba4ba07fe01886dd91fe96ac0250cd58071c (patch)
tree1bced04cc1d98f2470241d636998f2cd43920e7e /configure
parent968a51cfef19c0dd390001de742d775410ef3071 (diff)
downloadmpv-e696ba4ba07fe01886dd91fe96ac0250cd58071c.tar.bz2
mpv-e696ba4ba07fe01886dd91fe96ac0250cd58071c.tar.xz
The ivtv vo driver and the ivtv VIDIX driver are unrelated; do not disable the
VIDIX driver when the ivtv vo driver has been disabled. patch by Martin Dauskardt, martin.dauskardt gmx de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29429 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index 48b15232ad..177a1dce2e 100755
--- a/configure
+++ b/configure
@@ -4525,7 +4525,6 @@ if test "$_vidix" = yes ; then
def_vidix='#define CONFIG_VIDIX 1'
_vomodules="cvidix $_vomodules"
test "$_vidix_drivers" || _vidix_drivers="cyberblade ivtv mach64 mga mga_crtc2 nvidia pm2 pm3 radeon rage128 s3 sh_veu sis unichrome"
- test $_ivtv = "yes" || _vidix_drivers=$(echo $_vidix_drivers | sed s/ivtv//)
# some vidix drivers are architecture and os specific, discard them elsewhere
x86 || _vidix_drivers=$(echo $_vidix_drivers | sed -e s/cyberblade// -e s/sis// -e s/unichrome// -e s/s3//)