Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1048
diff -u -r1.1048 configure
--- configure	26 Aug 2005 19:08:28 -0000	1.1048
+++ configure	27 Aug 2005 12:55:09 -0000
@@ -6359,17 +6359,13 @@
 if test "$_tv_v4l" = auto ; then
  _tv_v4l=no
  if test "$_tv" = yes && linux ; then
-  for I in /dev/video /dev/video? ; do
-    if test -c $I ; then
-      cat > $TMPC <<EOF
+  cat > $TMPC <<EOF
 #include <stdlib.h>
 #include <linux/videodev.h>
 int main(void) { return 0; }
 EOF
-      cc_check && _tv_v4l=yes
-      break
-    fi
-  done
+  cc_check && _tv_v4l=yes
+  break
  fi
 fi
 if test "$_tv_v4l" = yes ; then
@@ -6386,12 +6382,14 @@
 if test "$_tv_v4l2" = auto ; then
  _tv_v4l2=no
  if test "$_tv" = yes && linux ; then
-  for I in /dev/video /dev/video? ; do
-    if test -c $I ; then
-      _tv_v4l2=yes
-      break
-    fi
-  done
+  cat > $TMPC <<EOF
+#include <stdlib.h>
+#include <linux/types.h>
+#include <linux/videodev2.h>
+int main(void) { return 0; }
+EOF
+  cc_check && _tv_v4l2=yes
+  break
  fi
 fi
 if test "$_tv_v4l2" = yes ; then
Index: libmpdemux/tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.30
diff -u -r1.30 tvi_v4l2.c
--- libmpdemux/tvi_v4l2.c	22 Aug 2005 20:04:42 -0000	1.30
+++ libmpdemux/tvi_v4l2.c	27 Aug 2005 12:55:10 -0000
@@ -40,7 +40,8 @@
 #ifdef HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #endif
-#include "videodev2.h"
+#include <linux/types.h>
+#include <linux/videodev2.h>
 #include "../mp_msg.h"
 #include "../libvo/img_format.h"
 #include "../libaf/af_format.h"