From 6a5f00b875131b99ce7a771f23d608b3f0866d70 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 1 Sep 2012 18:36:45 +0200
Subject: cleanup: video_out: remove vo_subdevice global variable

This wasn't accessed anymore.

This is all what was left of mplayer2 commit c54fae82fd16
("vo: fix crash if all VO open fallback attempts fail").
---
 libvo/video_out.c | 8 ++------
 libvo/video_out.h | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/libvo/video_out.c b/libvo/video_out.c
index a958847568..3ae3e319ed 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -64,12 +64,9 @@ int64_t WinID = -1;
 int vo_pts=0; // for hw decoding
 float vo_fps=0;
 
-char *vo_subdevice = NULL;
-
 int vo_colorkey = 0x0000ff00; // default colorkey is green
                               // (0xff000000 means that colorkey has been disabled)
 
-
 //
 // Externally visible list of all vo drivers
 //
@@ -302,7 +299,7 @@ struct vo *init_best_video_out(struct MPOpts *opts,
     if (vo_list && vo_list[0])
         while (vo_list[0][0]) {
             char *name = strdup(vo_list[0]);
-            vo_subdevice = strchr(name,':');
+            char *vo_subdevice = strchr(name,':');
             if (!strcmp(name, "pgm"))
                 mp_tmsg(MSGT_CPLAYER, MSGL_ERR, "The pgm video output driver has been replaced by -vo pnm:pgmyuv.\n");
             if (!strcmp(name, "md5"))
@@ -334,12 +331,11 @@ struct vo *init_best_video_out(struct MPOpts *opts,
             }
 	}
     // now try the rest...
-    vo_subdevice = NULL;
     for (i = 0; video_out_drivers[i]; i++) {
         const struct vo_driver *video_driver = video_out_drivers[i];
         *vo = initial_values;
         vo->driver = video_driver;
-        if (!vo_preinit(vo, vo_subdevice))
+        if (!vo_preinit(vo, NULL))
             return vo; // success!
         talloc_free_children(vo);
     }
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 3e46722dfd..e98dd36a72 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -324,8 +324,6 @@ extern int enable_mouse_movements;
 extern int vo_pts;
 extern float vo_fps;
 
-extern char *vo_subdevice;
-
 extern int vo_colorkey;
 
 extern int64_t WinID;
-- 
cgit v1.2.3