# HG changeset patch
# User henry
# Date 1126377503 0
# Node ID 11331109ecad90b1ca7ec9ab95588bbcb3647056
# Parent  2e0c2f65b81c3214348e775a97ade426a2183078
- remove useless /dev/video* checks
- add a proper configure check for v4l2
- prepare for videodev2.h removal

diff -r 2e0c2f65b81c -r 11331109ecad configure
--- a/configure	Sat Sep 10 18:23:40 2005 +0000
+++ b/configure	Sat Sep 10 18:38:23 2005 +0000
@@ -6370,17 +6370,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
@@ -6397,12 +6393,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
diff -r 2e0c2f65b81c -r 11331109ecad libmpdemux/tvi_v4l2.c
--- a/libmpdemux/tvi_v4l2.c	Sat Sep 10 18:23:40 2005 +0000
+++ b/libmpdemux/tvi_v4l2.c	Sat Sep 10 18:38:23 2005 +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"