Mercurial > mplayer.hg

changeset 35190:48943c3398ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Since the modecount variable is only ever initialized when the videmodes variable is, it also has to be a global variable.
author reimar
date Tue, 30 Oct 2012 16:34:02 +0000
parents 33e13b4ddfcb
children 69ef24582908
files libvo/x11_common.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/x11_common.c	Tue Oct 30 16:30:47 2012 +0000
+++ b/libvo/x11_common.c	Tue Oct 30 16:34:02 2012 +0000
@@ -131,6 +131,7 @@
 static int vo_old_height = 0;
 
 #ifdef CONFIG_XF86VM
+static int modecount;
 XF86VidModeModeInfo **vidmodes = NULL;
 XF86VidModeModeLine modeline;
 #endif
@@ -1631,8 +1632,6 @@
     int X = vo_dwidth, Y = vo_dheight;
     int modeline_width, modeline_height;
 
-    int modecount;
-
     if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error))
     {
         XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
@@ -1686,7 +1685,7 @@
 {
     if (vidmodes != NULL)
     {
-        int i, modecount;
+        int i;
 
         free(vidmodes);
         vidmodes = NULL;
@@ -1706,6 +1705,7 @@
         XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[i]);
         free(vidmodes);
         vidmodes = NULL;
+        modecount = 0;
     }
 }
 #endif