From 4655eb77878502d8718173de63bbeb10c01d5636 Mon Sep 17 00:00:00 2001
From: henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 10 Sep 2005 18:38:23 +0000
Subject: [PATCH] - remove useless /dev/video* checks - add a proper configure
 check for v4l2 - prepare for videodev2.h removal

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16443 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure             | 24 +++++++++++-------------
 libmpdemux/tvi_v4l2.c |  3 ++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 6619d2f416..4a12331d3e 100755
--- a/configure
+++ b/configure
@@ -6370,17 +6370,13 @@ echocheck "Video 4 Linux TV interface"
 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 @@ echocheck "Video 4 Linux 2 TV interface"
 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 --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index a04e73f5cf..0d967b498a 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -40,7 +40,8 @@ known issues:
 #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"