# HG changeset patch
# User alex
# Date 1065610724 0
# Node ID 497104408c30598451b28380228769d57eb9f0a0
# Parent  bbe74a48483f6e64f1fed2cf58b9296401726272
correct handling of subdevice, -fb device is obsoleted

diff -r bbe74a48483f -r 497104408c30 libvo/vo_fbdev.c
--- a/libvo/vo_fbdev.c	Wed Oct 08 10:42:59 2003 +0000
+++ b/libvo/vo_fbdev.c	Wed Oct 08 10:58:44 2003 +0000
@@ -639,14 +639,6 @@
   return cmap;
 }
 
-#ifdef CONFIG_VIDIX
-static uint32_t parseSubDevice(const char *sd)
-{
-   if(memcmp(sd,"vidix",5) == 0) vidix_name = &sd[5]; /* vidix_name will be valid within init() */
-   else { mp_msg(MSGT_VO, MSGL_WARN, "Unknown subdevice: '%s'\n", sd); return -1; }
-   return 0;
-}
-#endif
 
 static int fb_preinit(int reset)
 {
@@ -1114,11 +1106,21 @@
 static uint32_t preinit(const char *vo_subdevice)
 {
     pre_init_err = 0;
+
+    if(vo_subdevice)
+    {
 #ifdef CONFIG_VIDIX
-    if(vo_subdevice) parseSubDevice(vo_subdevice);
-    if(vidix_name) pre_init_err = vidix_preinit(vidix_name,&video_out_fbdev);
-    mp_msg(MSGT_VO, MSGL_DBG3, "vo_subdevice: initialization returns: %i\n",pre_init_err);
+	if (memcmp(vo_subdevice, "vidix", 5) == 0)
+	    vidix_name = &vo_subdevice[5];
+	if(vidix_name)
+	    pre_init_err = vidix_preinit(vidix_name,&video_out_fbdev);
+	else
 #endif
+	{
+	    if (fb_dev_name) free(fb_dev_name);
+	    fb_dev_name = strdup(vo_subdevice);
+	}
+    }
     if(!pre_init_err) return (pre_init_err=(fb_preinit(0)?0:-1));
     return(-1);
 }
diff -r bbe74a48483f -r 497104408c30 libvo/vo_fbdev2.c
--- a/libvo/vo_fbdev2.c	Wed Oct 08 10:42:59 2003 +0000
+++ b/libvo/vo_fbdev2.c	Wed Oct 08 10:58:44 2003 +0000
@@ -191,8 +191,13 @@
 	return -1;
 }
 
-static uint32_t preinit(const char *ignore)
+static uint32_t preinit(const char *subdevice)
 {
+	if (subdevice)
+	{
+	    if (fb_dev_name) free(fb_dev_name);
+	    fb_dev_name = strdup(subdevice);
+	}
 	return fb_preinit(0);
 }