Remove (extremely) old copy of videodev2.h

configure.ac

@@ -2115,29 +2115,6 @@ AC_ARG_ENABLE(pvr,
 if test "${enable_pvr}" = "yes"
 then
   VLC_ADD_PLUGIN([pvr])
-  AC_ARG_WITH(videodev2,
-    [  --with-videodev2=FILE   Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[])
-  if test "${with_videodev2}" != "no" -a -n "${with_videodev2}"
-  then
-    AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h])
-  fi
-
-  AC_CACHE_CHECK([for new linux/videodev2.h],
-      [ac_cv_new_linux_videodev2_h],
-      [AC_TRY_COMPILE([
-          #include <sys/types.h>
-          #   ifdef VIDEODEV2_H_FILE
-	  #   include VIDEODEV2_H_FILE
-	  #   else
-	  #   include <linux/videodev2.h>
-	  #   endif
-	  ],
-          [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ],
-          ac_cv_new_linux_videodev2_h=yes,
-          ac_cv_new_linux_videodev2_h=no)])
-  if test "${ac_cv_new_linux_videodev2_h}" != "no"; then
-    AC_DEFINE(HAVE_NEW_LINUX_VIDEODEV2_H, 1, [Define if new linux/videodev2.h present])
-  fi
 fi
 
 dnl

modules/access/Modules.am

@@ -38,7 +38,7 @@ SOURCES_access_eyetv = eyetv.m
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
-SOURCES_pvr = pvr.c videodev2.h
+SOURCES_pvr = pvr.c
 SOURCES_v4l2 = v4l2.c
 SOURCES_qtcapture = qtcapture.m
 SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h

modules/access/pvr.c

@@ -41,14 +41,12 @@
 #include <unistd.h>
 #include <linux/types.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_NEW_LINUX_VIDEODEV2_H
-#   ifdef VIDEODEV2_H_FILE
-#   include VIDEODEV2_H_FILE
-#   else
+#if defined(HAVE_LINUX_VIDEODEV2_H)
 #   include <linux/videodev2.h>
-#   endif
+#elif defined(HAVE_SYS_VIDEOIO_H)
+#   include <sys/videoio.h>
 #else
-#include "videodev2.h"
+#   error "No Video4Linux2 headers found."
 #endif
 
 /*****************************************************************************
@@ -307,8 +305,6 @@ static int ConfigureIVTV( access_t * p_access )
     return VLC_SUCCESS;
 }
 
-#ifdef HAVE_NEW_LINUX_VIDEODEV2_H
-
 #define MAX_V4L2_CTRLS (6)
 /*****************************************************************************
  * AddV4L2Ctrl: adds a control to the v4l2 controls list
@@ -536,8 +532,6 @@ static int ConfigureV4L2( access_t * p_access )
     return VLC_SUCCESS;
 }
 
-#endif /* HAVE_NEW_LINUX_VIDEODEV2_H */
-
 /*****************************************************************************
  * Open: open the device
  *****************************************************************************/
@@ -856,17 +850,12 @@ static int Open( vlc_object_t * p_this )
     {
         if( p_sys->b_v4l2_api )
         {
-#ifdef HAVE_NEW_LINUX_VIDEODEV2_H
             result = ConfigureV4L2( p_access );
             if( result != VLC_SUCCESS )
             {
                 Close( VLC_OBJECT(p_access) );
                 return result;
             }
-#else
-            msg_Warn( p_access, "You have new ivtvdrivers, "
-                      "but this vlc was built against an old v4l2 version." );
-#endif
         }
         else
         {