[MPlayer-dev-eng] [PATCH] v4l2 interface (update)

[Martin Olschewski]

Hello,

Szabo Akos and Martin Braun correctly pointed out that the patch for
libmpdemux/tv.c is missing in my original mail.  Thanks for that,
I am going to end up drinking a lot of cola if things continue like
that ;-).  Here is the missing part.

Have fun,

  Martin

-- 
Dipl.-Inform. Martin Olschewski 	Center for Applied Computer Science
Email: olschewski at zpr.uni-koeln.de	University of Cologne
Tel.:  ++49/221/470-6018		Weyertal 80
Fax.:  ++49/221/470-5160		D-50931 K\"oln
-------------- next part --------------
Index: libmpdemux/tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.48
diff -u -r1.48 tv.c
--- libmpdemux/tv.c	14 Jan 2003 23:15:36 -0000	1.48
+++ libmpdemux/tv.c	15 Jan 2003 11:40:29 -0000
@@ -514,6 +514,7 @@
 /* ================== STREAM_TV ===================== */
 tvi_handle_t *tvi_init_dummy(char *device);
 tvi_handle_t *tvi_init_v4l(char *device, char *adevice);
+tvi_handle_t *tvi_init_v4l2(char *device, char *adevice);
 tvi_handle_t *tvi_init_bsdbt848(char *device);
 
 tvi_handle_t *tv_begin(void)
@@ -523,6 +524,10 @@
 #ifdef HAVE_TV_V4L
     if (!strcmp(tv_param_driver, "v4l"))
 	return tvi_init_v4l(tv_param_device, tv_param_adevice);
+#endif
+#ifdef HAVE_TV_V4L2
+    if (!strcmp(tv_param_driver, "v4l2"))
+	return tvi_init_v4l2(tv_param_device, tv_param_adevice);
 #endif
 #ifdef HAVE_TV_BSDBT848
     if (!strcmp(tv_param_driver, "bsdbt848"))